During testing do not postpone execution of the tasks

django_atomic_celery/__init__.py

@@ -2,6 +2,7 @@
 import threading
 from collections import defaultdict
 from celery.task import task as base_task, Task
+from django.conf import settings
 from django.dispatch import receiver
 from django.db import DEFAULT_DB_ALIAS
 from functools import partial
@@ -27,8 +28,8 @@ def schedule(self):
         """Schedule the conditional task.
         """
 
-        self.task_cls.original_apply_async(*self.task_args,
-                                           **self.task_kwargs)
+        return self.task_cls.original_apply_async(*self.task_args,
+                                                  **self.task_kwargs)
 
     @property
     def name(self):
@@ -91,7 +92,8 @@ def apply_async(cls, args=(), kwargs=None, *a, **kw):
 
         t = ConditionalTask(cls, args, kwargs, *a, **kw)
 
-        if task_queue_stack:
+        if task_queue_stack and not getattr(settings,
+                                            'CELERY_ALWAYS_EAGER', False):
             logger.debug('Scheduling task %s if transaction block is '
                          'successful' % (t.description))
             task_queue_stack[-1].append(t)

tests/tasks.py

@@ -1,6 +1,11 @@
 from django_atomic_celery import task
 
 
+@task
+def returning_task(sentinel):
+    return sentinel
+
+
 @task
 def task(*arg, **kwargs):
     pass

tests/test_task.py

@@ -6,7 +6,7 @@
 from django.conf import settings
 from django.test import TestCase
 from django_atomic_celery.testing import DjangoAtomicCeleryTestCaseMixin
-from .tasks import task
+from .tasks import returning_task, task
 
 
 class TaskTestCase(DjangoAtomicCeleryTestCaseMixin, TestCase):
@@ -132,3 +132,20 @@ def test_apply_async(self):
         self._test_behavior(task.apply_async)
         self._test_behavior(task.apply_async, args=())
         self._test_behavior(task.apply_async, kwargs={})
+
+
+class EagerTestCase(TestCase):
+    """
+    Check here behaviour of django_atomic_celery related to
+    CELERY_ALWAYS_EAGER settings
+    """
+
+    def test_celery_always_eager(self):
+        """
+        task.apply_async() should return immediately
+        because CELERY_ALWAYS_EAGER is True
+        """
+        with self.settings(CELERY_ALWAYS_EAGER=True):
+            sentinel = object()
+            self.assertTrue(
+                returning_task.apply_async(args=(sentinel,)).get() is sentinel)