X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/35ade8a042094a27e2ca5cfd5e9754aa3513410c..5f7b9f0177ca5a045eddb791116f5e6ff823f7fc:/apps/workbench/test/test_helper.rb

diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb
index 89341a6323..7f07f180db 100644
--- a/apps/workbench/test/test_helper.rb
+++ b/apps/workbench/test/test_helper.rb
@@ -97,18 +97,19 @@ end
 class ApiServerForTests
   ARV_API_SERVER_DIR = File.expand_path('../../../../services/api', __FILE__)
   SERVER_PID_PATH = File.expand_path('tmp/pids/wbtest-server.pid', ARV_API_SERVER_DIR)
+  WEBSOCKET_PID_PATH = File.expand_path('tmp/pids/wstest-server.pid', ARV_API_SERVER_DIR)
   @main_process_pid = $$
 
-  def self._system(*cmd)
+  def _system(*cmd)
     $stderr.puts "_system #{cmd.inspect}"
     Bundler.with_clean_env do
-      if not system({'RAILS_ENV' => 'test'}, *cmd)
+      if not system({'RAILS_ENV' => 'test', "ARVADOS_WEBSOCKETS" => (if @websocket then "ws-only" end)}, *cmd)
         raise RuntimeError, "#{cmd[0]} returned exit code #{$?.exitstatus}"
       end
     end
   end
 
-  def self.make_ssl_cert
+  def make_ssl_cert
     unless File.exists? './self-signed.key'
       _system('openssl', 'req', '-new', '-x509', '-nodes',
               '-out', './self-signed.pem',
@@ -118,42 +119,55 @@ class ApiServerForTests
     end
   end
 
-  def self.kill_server
+  def kill_server
     if (pid = find_server_pid)
       $stderr.puts "Sending TERM to API server, pid #{pid}"
       Process.kill 'TERM', pid
     end
   end
 
-  def self.find_server_pid
+  def find_server_pid
     pid = nil
     begin
-      pid = IO.read(SERVER_PID_PATH).to_i
+      pid = IO.read(@pidfile).to_i
       $stderr.puts "API server is running, pid #{pid.inspect}"
     rescue Errno::ENOENT
     end
     return pid
   end
 
-  def self.run(args=[])
+  def run(args=[])
     ::MiniTest.after_run do
       self.kill_server
     end
 
+    @websocket = args.include?("--websockets")
+
+    @pidfile = if @websocket
+                 WEBSOCKET_PID_PATH
+               else
+                 SERVER_PID_PATH
+               end
+
     # Kill server left over from previous test run
     self.kill_server
 
     Capybara.javascript_driver = :poltergeist
     Dir.chdir(ARV_API_SERVER_DIR) do |apidir|
       ENV["NO_COVERAGE_TEST"] = "1"
-      make_ssl_cert
-      _system('bundle', 'exec', 'rake', 'db:test:load')
-      _system('bundle', 'exec', 'rake', 'db:fixtures:load')
-      _system('bundle', 'exec', 'passenger', 'start', '-d', '-p3000',
-              '--pid-file', SERVER_PID_PATH,
-              '--ssl',
-              '--ssl-certificate', 'self-signed.pem',
-              '--ssl-certificate-key', 'self-signed.key')
+      if @websocket
+        _system('bundle', 'exec', 'passenger', 'start', '-d', '-p3333',
+                '--pid-file', @pidfile)
+      else
+        make_ssl_cert
+        _system('bundle', 'exec', 'rake', 'db:test:load')
+        _system('bundle', 'exec', 'rake', 'db:fixtures:load')
+        _system('bundle', 'exec', 'passenger', 'start', '-d', '-p3000',
+                '--pid-file', @pidfile,
+                '--ssl',
+                '--ssl-certificate', 'self-signed.pem',
+                '--ssl-certificate-key', 'self-signed.key')
+      end
       timeout = Time.now.tv_sec + 10
       good_pid = false
       while (not good_pid) and (Time.now.tv_sec < timeout)
@@ -168,6 +182,12 @@ class ApiServerForTests
       end
     end
   end
+
+  def run_rake_task(task_name, arg_string)
+    Dir.chdir(ARV_API_SERVER_DIR) do
+      _system('bundle', 'exec', 'rake', "#{task_name}[#{arg_string}]")
+    end
+  end
 end
 
 class ActionController::TestCase
@@ -190,6 +210,22 @@ class ActionController::TestCase
   end
 end
 
+# If it quacks like a duck, it must be a HTTP request object.
+class RequestDuck
+  def self.host
+    "localhost"
+  end
+
+  def self.port
+    8080
+  end
+
+  def self.protocol
+    "http"
+  end
+end
+
 if ENV["RAILS_ENV"].eql? 'test'
-  ApiServerForTests.run
+  ApiServerForTests.new.run
+  ApiServerForTests.new.run ["--websockets"]
 end