Moved tests back to celery/tests as picklefield broke the tests when pickling. (The C API in <=2.6 uses relative imports by default, resulting in package conflicts)

tests/testunits/test_backends/test_redis.py → celery/tests/test_backends/test_redis.py

@@ -10,7 +10,7 @@ from celery.utils import gen_unique_id
 from celery.backends import pyredis
 from celery.backends.pyredis import RedisBackend
 
-from testunits.utils import execute_context, mask_modules
+from celery.tests.utils import execute_context, mask_modules
 
 _no_redis_msg = "* Redis %s. Will not execute related tests."
 _no_redis_msg_emitted = False

tests/testunits/test_buckets.py → celery/tests/test_buckets.py

@@ -13,7 +13,7 @@ from celery.utils import gen_unique_id
 from celery.worker import buckets
 from celery.registry import TaskRegistry
 
-from testunits.utils import skip_if_environ
+from celery.tests.utils import skip_if_environ
 
 skip_if_disabled = curry(skip_if_environ("SKIP_RLIMITS"))
 

tests/testunits/test_loaders.py → celery/tests/test_loaders.py

@@ -9,7 +9,7 @@ from celery.loaders import base
 from celery.loaders import djangoapp
 from celery.loaders import default
 
-from testunits.utils import with_environ
+from celery.tests.utils import with_environ
 
 
 class TestLoaders(unittest.TestCase):

tests/testunits/test_log.py → celery/tests/test_log.py

@@ -10,13 +10,13 @@ from StringIO import StringIO
 try:
     from contextlib import contextmanager
 except ImportError:
-    from testunits.utils import fallback_contextmanager as contextmanager
+    from celery.tests.utils import fallback_contextmanager as contextmanager
 
 from carrot.utils import rpartition
 
 from celery.log import (setup_logger, emergency_error,
                         redirect_stdouts_to_logger, LoggingProxy)
-from testunits.utils import override_stdouts, execute_context
+from celery.tests.utils import override_stdouts, execute_context
 
 
 @contextmanager

tests/testunits/test_result.py → celery/tests/test_result.py

@@ -9,7 +9,7 @@ from celery.backends import default_backend
 from celery.exceptions import TimeoutError
 from celery.task.base import Task
 
-from testunits.utils import skip_if_quick
+from celery.tests.utils import skip_if_quick
 
 
 def mock_task(name, status, result):

tests/testunits/test_serialization.py → celery/tests/test_serialization.py

@@ -1,7 +1,7 @@
 import sys
 import unittest
 
-from testunits.utils import execute_context, mask_modules
+from celery.tests.utils import execute_context, mask_modules
 
 
 class TestAAPickle(unittest.TestCase):

tests/testunits/test_task.py → celery/tests/test_task.py

@@ -5,10 +5,11 @@ from datetime import datetime, timedelta
 from celery import task
 from celery import messaging
 from celery.result import EagerResult
+from celery.execute import send_task
 from celery.backends import default_backend
 from celery.decorators import task as task_dec
-from celery.worker.listener import parse_iso8601
 from celery.exceptions import RetryTaskError
+from celery.worker.listener import parse_iso8601
 
 def return_True(*args, **kwargs):
     # Task run functions can't be closures/lambdas, as they're pickled.
@@ -281,6 +282,11 @@ class TestCeleryTasks(unittest.TestCase):
         self.assertNextTaskDataEquals(consumer, presult2, t1.name,
                 name="George Constanza")
 
+        # send_task
+        sresult = send_task(t1.name, kwargs=dict(name="Elaine M. Benes"))
+        self.assertNextTaskDataEquals(consumer, sresult, t1.name,
+                name="Elaine M. Benes")
+
         # With eta.
         presult2 = task.apply_async(t1, kwargs=dict(name="George Constanza"),
                                     eta=datetime.now() + timedelta(days=1))

tests/testunits/test_task_http.py → celery/tests/test_task_http.py

@@ -8,7 +8,7 @@ from urllib import addinfourl
 try:
     from contextlib import contextmanager
 except ImportError:
-    from testunits.utils import fallback_contextmanager as contextmanager
+    from celery.tests.utils import fallback_contextmanager as contextmanager
 try:
     from cStringIO import StringIO
 except ImportError:
@@ -19,7 +19,7 @@ from anyjson import serialize
 
 from celery.task import http
 
-from testunits.utils import eager_tasks, execute_context
+from celery.tests.utils import eager_tasks, execute_context
 
 
 @contextmanager

tests/testunits/test_utils.py → celery/tests/test_utils.py

@@ -6,8 +6,8 @@ from billiard.utils.functional import wraps
 
 from celery import utils
 
-from testunits.utils import sleepdeprived, execute_context
-from testunits.utils import mask_modules
+from celery.tests.utils import sleepdeprived, execute_context
+from celery.tests.utils import mask_modules
 
 class TestChunks(unittest.TestCase):
 

tests/testunits/test_worker.py → celery/tests/test_worker.py

@@ -16,8 +16,8 @@ from celery.worker.scheduler import Scheduler
 from celery.decorators import task as task_dec
 from celery.decorators import periodic_task as periodic_task_dec
 
-from testunits.utils import execute_context
-from testunits.compat import catch_warnings
+from celery.tests.utils import execute_context
+from celery.tests.compat import catch_warnings
 
 
 class PlaceHolder(object):

tests/testunits/test_worker_job.py → celery/tests/test_worker_job.py

@@ -20,8 +20,8 @@ from celery.exceptions import RetryTaskError, NotRegistered
 from celery.decorators import task as task_dec
 from celery.datastructures import ExceptionInfo
 
-from testunits.utils import execute_context
-from testunits.compat import catch_warnings
+from celery.tests.utils import execute_context
+from celery.tests.compat import catch_warnings
 
 scratch = {"ACK": False}
 some_kwargs_scratchpad = {}

tests/settings.py

@@ -25,7 +25,7 @@ COVERAGE_EXCLUDE_MODULES = ("celery.__init__",
                             "celery.management.*",
                             "celery.contrib.*",
                             "celery.bin.celeryinit",
-                            "celery.bin.celerybeat"
+                            "celery.bin.celerybeat",
                             "celery.utils.patch",
                             "celery.utils.compat",
                             "celery.task.rest",
@@ -34,7 +34,7 @@ COVERAGE_EXCLUDE_MODULES = ("celery.__init__",
                             "celery.backends.tyrant", # FIXME
 )
 
-NOSE_ARGS = [here,
+NOSE_ARGS = [os.path.join(here, os.pardir, "celery", "tests"),
             "--cover3-package=celery",
             "--cover3-branch",
             "--cover3-exclude=%s" % ",".join(COVERAGE_EXCLUDE_MODULES)]