Ask Solem 8 lat temu
rodzic
commit
d0df567efd
3 zmienionych plików z 6 dodań i 4 usunięć
  1. 1 1
      celery/backends/base.py
  2. 1 1
      celery/bin/base.py
  3. 4 2
      celery/utils/pytest.py

+ 1 - 1
celery/backends/base.py

@@ -770,4 +770,4 @@ class DisabledBackend(BaseBackend):
         return 'disabled://'
 
     get_state = get_status = get_result = get_traceback = _is_disabled
-    wait_for = get_many = _is_disabled
+    get_task_meta_for = wait_for = get_many = _is_disabled

+ 1 - 1
celery/bin/base.py

@@ -514,7 +514,7 @@ class Command(object):
 
     def _parse_preload_options(self, args, options):
         args = [arg for arg in args if arg not in ('-h', '--help')]
-        parser = argparse.ArgumentParser()
+        parser = self.Parser()
         self.add_compat_options(parser, options)
         namespace, _ = parser.parse_known_args(args)
         return vars(namespace)

+ 4 - 2
celery/utils/pytest.py

@@ -70,12 +70,13 @@ class UnitLogging(symbol_by_name(Celery.log_cls)):
 
 
 def TestApp(name=None, set_as_current=False, log=UnitLogging,
-            broker='memory://', backend='cache+memory://', **kwargs):
+            broker='memory://', backend=None, **kwargs):
     """App used for testing."""
     test_app = Celery(
         name or 'celery.tests',
         set_as_current=set_as_current,
-        log=log, broker=broker, backend=backend, **kwargs)
+        log=log, broker=broker,
+        backend=backend or 'cache+memory://', **kwargs)
     test_app.add_defaults(deepcopy(CELERY_TEST_CONFIG))
     return test_app
 
@@ -86,6 +87,7 @@ def app(request):
     from celery import _state
     mark = request.node.get_marker('celery')
     mark = mark and mark.kwargs or {}
+    print('MARK: %r' % (mark,))
 
     prev_current_app = current_app()
     prev_default_app = _state.default_app