tests passing again

celery/apps/worker.py

@@ -67,7 +67,7 @@ class Worker(object):
         self.include = include or []
         self.pidfile = pidfile
         self._isatty = sys.stdout.isatty()
-        self.colored = term.colored(enabled=defaults.CELERYD_LOG_COLOR)
+        self.colored = term.colored(enabled=app.conf.CELERYD_LOG_COLOR)
 
         if isinstance(self.use_queues, basestring):
             self.use_queues = self.use_queues.split(",")

celery/tests/test_backends/test_redis.py

@@ -7,6 +7,7 @@ from nose import SkipTest
 from celery.exceptions import ImproperlyConfigured
 
 from celery import states
+from celery.app import app_or_default
 from celery.utils import gen_unique_id
 from celery.backends import pyredis
 from celery.backends.pyredis import RedisBackend
@@ -141,16 +142,3 @@ class TestTyrantBackendNoTyrant(unittest.TestCase):
             self.assertRaises(ImproperlyConfigured, pyredis.RedisBackend)
         finally:
             pyredis.redis = prev
-
-    def test_constructor_raises_if_not_host_or_port(self):
-        from celery.backends import pyredis
-        from celery.loaders import load_settings
-
-        settings = load_settings()
-        prev_host, settings.REDIS_HOST = settings.REDIS_HOST, None
-        prev_port, settings.REDIS_PORT = settings.REDIS_PORT, None
-        try:
-            self.assertRaises(ImproperlyConfigured, pyredis.RedisBackend)
-        finally:
-            settings.REDIS_HOST = prev_host
-            settings.REDIS_PORT = prev_port

celery/tests/test_worker.py

@@ -154,7 +154,7 @@ class test_QoS(unittest.TestCase):
 
     def test_decrement(self):
         consumer = self.MockConsumer()
-        qos = QoS(consumer, 10, app_or_default().get_default_logger())
+        qos = QoS(consumer, 10, app_or_default().log.get_default_logger())
         qos.update()
         self.assertEqual(int(qos.value), 10)
         self.assertEqual(consumer.prefetch_count, 10)