Only instantiate Queue in testgrpc-unavailable-restart

1 files changed, 11 insertions, 11 deletions

diff --git a/lib/gitlab/sidekiq_middleware/shutdown.rb b/lib/gitlab/sidekiq_middleware/shutdown.rb
index 0daf7772781..c2b8d6de66e 100644
--- a/lib/gitlab/sidekiq_middleware/shutdown.rb
+++ b/lib/gitlab/sidekiq_middleware/shutdown.rb
@@ -42,7 +42,7 @@ module Gitlab
       end
 
       def initialize
-        @trace = Queue.new
+        @trace = Queue.new if Rails.env.test?
       end
 
       def call(worker, job, queue)
@@ -114,19 +114,19 @@ module Gitlab
       end
 
       def sleep(time)
-        @trace << [:sleep, time]
-
-        return if Rails.env.test?
-
-        Kernel.sleep(time)
+        if Rails.env.test?
+          @trace << [:sleep, time]
+        else
+          Kernel.sleep(time)
+        end
       end
 
       def kill(signal, pid)
-        @trace << [:kill, signal, pid]
-
-        return if Rails.env.test?
-
-        Process.kill(signal, pid)
+        if Rails.env.test?
+          @trace << [:kill, signal, pid]
+        else
+          Process.kill(signal, pid)
+        end
       end
     end
   end