From 2fa4cbeebde4cbaf4fdddb1723960710c67f89a8 Mon Sep 17 00:00:00 2001
From: Ari Pollak <ajp@aripollak.com>
Date: Fri, 28 Nov 2014 15:54:47 -0500
Subject: Fix Sidekiq ActiveJob integration setup

* .connect on a Redis connection wasn't valid
* Reset logger after we're done testing for redis connection to avoid
  "closed stream" error when starting server for real from a fork
---
 activejob/test/support/integration/adapters/sidekiq.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/activejob/test/support/integration/adapters/sidekiq.rb b/activejob/test/support/integration/adapters/sidekiq.rb
index 3cc9a34993..b03a9b81c9 100644
--- a/activejob/test/support/integration/adapters/sidekiq.rb
+++ b/activejob/test/support/integration/adapters/sidekiq.rb
@@ -48,7 +48,8 @@ module SidekiqJobsManager
 
   def can_run?
     begin
-      Sidekiq.redis { |conn| conn.connect }
+      Sidekiq.redis { |conn| conn.info }
+      Sidekiq.logger = nil
     rescue
       return false
     end
-- 
cgit v1.2.3