Redis backend passes tests again

celery/tests/test_backends/test_redis.py

@@ -46,7 +46,7 @@ def get_redis_or_SkipTest():
         tb = RedisBackend(redis_db="celery_unittest")
         try:
             # Evaluate lazy connection
-            tb.client.connection.connect(tb.client)
+            tb.client.info()
         except ConnectionError, exc:
             emit_no_redis_msg("not running")
             raise SkipTest("can't connect to redis: %s" % (exc, ))
@@ -94,16 +94,6 @@ class TestRedisBackend(unittest.TestCase):
         self.assertEqual(tb.get_status(tid3), states.FAILURE)
         self.assertIsInstance(tb.get_result(tid3), KeyError)
 
-    def test_connection_close_if_connected(self):
-        tb = get_redis_or_SkipTest()
-
-        client = tb.client
-        self.assertIsNotNone(client)
-        tb.process_cleanup()
-        self.assertRaises(KeyError, tb.__dict__.__getitem__, "client")
-        tb.process_cleanup()
-        self.assertRaises(KeyError, tb.__dict__.__getitem__, "client")
-
 
 class TestRedisBackendNoRedis(unittest.TestCase):
 

celery/tests/test_backends/test_redis_unit.py

@@ -93,12 +93,3 @@ class test_RedisBackend(unittest.TestCase):
         key = b.get_key_for_task(uuid)
         b.store_result(uuid, 42, states.SUCCESS)
         self.assertEqual(b.client.expiry[key], 512)
-
-    def test_closes_connection_at_process_cleanup(self):
-        b = self.Backend(expires=512)
-        client = b.client
-        self.assertTrue(client.connection.connected)
-        b.process_cleanup()
-        self.assertFalse(client.connection.connected)
-        b.process_cleanup()
-        self.assertFalse(client.connection.connected)