Explorar el Código

Tests passing

Ask Solem hace 8 años
padre
commit
1349deb123
Se han modificado 3 ficheros con 11 adiciones y 5 borrados
  1. 6 0
      celery/backends/async.py
  2. 1 1
      celery/bin/worker.py
  3. 4 4
      celery/tests/bin/test_base.py

+ 6 - 0
celery/backends/async.py

@@ -33,6 +33,12 @@ class Drainer(object):
     def __init__(self, result_consumer):
         self.result_consumer = result_consumer
 
+    def start(self):
+        pass
+
+    def stop(self):
+        pass
+
     def drain_events_until(self, p, timeout=None, on_interval=None,
                            monotonic=monotonic, wait=None):
         wait = wait or self.result_consumer.drain_events

+ 1 - 1
celery/bin/worker.py

@@ -257,7 +257,7 @@ class worker(Command):
         wopts.add_option('-D', '--detach', action='store_true')
         wopts.add_option(
             '-S', '--statedb',
-            default=conf.worker_state_db)
+            default=conf.worker_state_db,
         )
         wopts.add_option('-l', '--loglevel', default='WARN')
         wopts.add_option('-O', dest='optimization')

+ 4 - 4
celery/tests/bin/test_base.py

@@ -37,7 +37,7 @@ class test_Extensions(AppCase):
 
     def test_load(self):
         with patch('pkg_resources.iter_entry_points') as iterep:
-            with patch('celery.bin.base.symbol_by_name') as symbyname:
+            with patch('celery.utils.imports.symbol_by_name') as symbyname:
                 ep = Mock()
                 ep.name = 'ep'
                 ep.module_name = 'foo'
@@ -50,13 +50,13 @@ class test_Extensions(AppCase):
                 symbyname.assert_called_with('foo:bar')
                 register.assert_called_with(cls, name='ep')
 
-            with patch('celery.bin.base.symbol_by_name') as symbyname:
+            with patch('celery.utils.imports.symbol_by_name') as symbyname:
                 symbyname.side_effect = SyntaxError()
                 with patch('warnings.warn') as warn:
                     e.load()
                     warn.assert_called()
 
-            with patch('celery.bin.base.symbol_by_name') as symbyname:
+            with patch('celery.utils.imports.symbol_by_name') as symbyname:
                 symbyname.side_effect = KeyError('foo')
                 with self.assertRaises(KeyError):
                     e.load()
@@ -351,7 +351,7 @@ class test_Command(AppCase):
 
     def test_find_app(self):
         cmd = MockCommand(app=self.app)
-        with patch('celery.bin.base.symbol_by_name') as sbn:
+        with patch('celery.utils.imports.symbol_by_name') as sbn:
             from types import ModuleType
             x = ModuleType(bytes_if_py2('proj'))