1 files changed, 60 insertions, 20 deletions
diff --git a/activejob/test/support/integration/adapters/sidekiq.rb b/activejob/test/support/integration/adapters/sidekiq.rb
index 6ff18fb56a..4988cdb33f 100644
--- a/activejob/test/support/integration/adapters/sidekiq.rb
+++ b/activejob/test/support/integration/adapters/sidekiq.rb
@@ -1,6 +1,8 @@
-require 'sidekiq/cli'
 require 'sidekiq/api'
 
+require 'sidekiq/testing'
+Sidekiq::Testing.disable!
+
 module SidekiqJobsManager
 
   def setup
@@ -17,33 +19,71 @@ module SidekiqJobsManager
   end
 
   def start_workers
-    fork do
-      sidekiq = Sidekiq::CLI.instance
+    continue_read, continue_write = IO.pipe
+    death_read, death_write = IO.pipe
+
+    @pid = fork do
+      continue_read.close
+      death_write.close
+
+      # Celluloid & Sidekiq are not warning-clean :(
+      $VERBOSE = false
+
+      $stdin.reopen('/dev/null')
+      $stdout.sync = true
+      $stderr.sync = true
+
       logfile = Rails.root.join("log/sidekiq.log").to_s
-      pidfile = Rails.root.join("tmp/sidekiq.pid").to_s
-      sidekiq.parse([ "--require", Rails.root.to_s,
-                      "--queue",   "integration_tests",
-                      "--logfile", logfile,
-                      "--pidfile", pidfile,
-                      "--environment", "test",
-                      "--concurrency", "1",
-                      "--timeout", "1",
-                      "--daemon",
-                      ])
+      Sidekiq::Logging.initialize_logger(logfile)
+
+      self_read, self_write = IO.pipe
+      trap "TERM" do
+        self_write.puts("TERM")
+      end
+
+      Thread.new do
+        begin
+          death_read.read
+        rescue Exception
+        end
+        self_write.puts("TERM")
+      end
+
       require 'celluloid'
-      require 'sidekiq/scheduled'
+      Celluloid.logger = nil
+      require 'sidekiq/launcher'
+      sidekiq = Sidekiq::Launcher.new({queues: ["integration_tests"],
+                                       environment: "test",
+                                       concurrency: 1,
+                                       timeout: 1,
+                                      })
       Sidekiq.poll_interval = 0.5
       Sidekiq::Scheduled.const_set :INITIAL_WAIT, 1
-      sidekiq.run
+      begin
+        sidekiq.run
+        continue_write.puts "started"
+        while readable_io = IO.select([self_read])
+          signal = readable_io.first[0].gets.strip
+          raise Interrupt if signal == "TERM"
+        end
+      rescue Interrupt
+      end
+
+      sidekiq.stop
+      exit!
     end
-    sleep 1
+    continue_write.close
+    death_read.close
+    @worker_lifeline = death_write
+
+    raise "Failed to start worker" unless continue_read.gets == "started\n"
   end
 
   def stop_workers
-    pidfile = Rails.root.join("tmp/sidekiq.pid").to_s
-    Process.kill 'TERM', File.open(pidfile).read.to_i
-    FileUtils.rm_f pidfile
-  rescue
+    if @pid
+      Process.kill 'TERM', @pid
+      Process.wait @pid
+    end
   end
 
   def can_run?