[testsuite] Do not import directly from mock/nose

celery/tests/app/test_amqp.py

@@ -1,11 +1,10 @@
 from __future__ import absolute_import
 
 from kombu import Exchange, Queue
-from mock import Mock
 
 from celery.app.amqp import Queues, TaskPublisher
 from celery.five import keys
-from celery.tests.case import AppCase
+from celery.tests.case import AppCase, Mock
 
 
 class test_TaskProducer(AppCase):

celery/tests/app/test_app.py

@@ -4,7 +4,6 @@ import os
 import itertools
 
 from copy import deepcopy
-from mock import Mock, patch
 from pickle import loads, dumps
 
 from kombu import Exchange
@@ -23,8 +22,10 @@ from celery.utils.serialization import pickle
 from celery.tests.case import (
     CELERY_TEST_CONFIG,
     AppCase,
+    Mock,
     depends_on_current_app,
     mask_modules,
+    patch,
     platform_pyimp,
     sys_platform,
     pypy_version,

celery/tests/app/test_beat.py

@@ -3,15 +3,13 @@ from __future__ import absolute_import
 import errno
 
 from datetime import datetime, timedelta
-from mock import Mock, call, patch
-from nose import SkipTest
 from pickle import dumps, loads
 
 from celery import beat
 from celery.five import keys, string_t
 from celery.schedules import schedule
 from celery.utils import uuid
-from celery.tests.case import AppCase
+from celery.tests.case import AppCase, Mock, SkipTest, call, patch
 
 
 class Object(object):

celery/tests/app/test_builtins.py

@@ -1,13 +1,11 @@
 from __future__ import absolute_import
 
-from mock import Mock, patch
-
 from celery import group, chord
 from celery.app import builtins
 from celery.canvas import Signature
 from celery.five import range
 from celery._state import _task_stack
-from celery.tests.case import AppCase
+from celery.tests.case import AppCase, Mock, patch
 
 
 class BuiltinsCase(AppCase):

celery/tests/app/test_defaults.py

@@ -3,11 +3,12 @@ from __future__ import absolute_import
 import sys
 
 from importlib import import_module
-from mock import Mock, patch
 
 from celery.app.defaults import NAMESPACES
 
-from celery.tests.case import AppCase, pypy_version, sys_platform
+from celery.tests.case import (
+    AppCase, Mock, patch, pypy_version, sys_platform,
+)
 
 
 class test_defaults(AppCase):

celery/tests/app/test_loaders.py

@@ -4,8 +4,6 @@ import os
 import sys
 import warnings
 
-from mock import Mock, patch
-
 from celery import loaders
 from celery.exceptions import (
     NotConfigured,
@@ -18,7 +16,7 @@ from celery.utils.imports import NotAPackage
 from celery.utils.mail import SendmailWarning
 
 from celery.tests.case import (
-    AppCase, Case, depends_on_current_app, with_environ,
+    AppCase, Case, Mock, depends_on_current_app, patch, with_environ,
 )
 
 

celery/tests/app/test_log.py

@@ -4,9 +4,6 @@ import sys
 import logging
 from tempfile import mktemp
 
-from mock import patch, Mock
-from nose import SkipTest
-
 from celery import signals
 from celery.app.log import TaskFormatter
 from celery.utils.log import LoggingProxy
@@ -22,8 +19,8 @@ from celery.utils.log import (
     _patch_logger_class,
 )
 from celery.tests.case import (
-    AppCase, override_stdouts, wrap_logger, get_handlers,
-    restore_logging,
+    AppCase, Mock, SkipTest,
+    get_handlers, override_stdouts, patch, wrap_logger, restore_logging,
 )
 
 

celery/tests/app/test_schedules.py

@@ -6,11 +6,9 @@ from contextlib import contextmanager
 from datetime import datetime, timedelta
 from pickle import dumps, loads
 
-from nose import SkipTest
-
 from celery.five import items
 from celery.schedules import ParseException, crontab, crontab_parser
-from celery.tests.case import AppCase
+from celery.tests.case import AppCase, SkipTest
 
 
 @contextmanager

celery/tests/backends/test_amqp.py

@@ -8,7 +8,6 @@ from datetime import timedelta
 from pickle import dumps, loads
 
 from billiard.einfo import ExceptionInfo
-from mock import patch
 
 from celery import states
 from celery.backends.amqp import AMQPBackend
@@ -17,7 +16,7 @@ from celery.five import Empty, Queue, range
 from celery.utils import uuid
 
 from celery.tests.case import (
-    AppCase, Mock, depends_on_current_app, sleepdeprived,
+    AppCase, Mock, depends_on_current_app, patch, sleepdeprived,
 )
 
 

celery/tests/backends/test_backends.py

@@ -1,11 +1,9 @@
 from __future__ import absolute_import
 
-from mock import patch
-
 from celery import backends
 from celery.backends.amqp import AMQPBackend
 from celery.backends.cache import CacheBackend
-from celery.tests.case import AppCase, depends_on_current_app
+from celery.tests.case import AppCase, depends_on_current_app, patch
 
 
 class test_backends(AppCase):

celery/tests/backends/test_base.py

@@ -4,8 +4,6 @@ import sys
 import types
 
 from contextlib import contextmanager
-from mock import Mock, patch
-from nose import SkipTest
 
 from celery.exceptions import ChordError
 from celery.five import items, range
@@ -23,7 +21,7 @@ from celery.backends.base import (
 )
 from celery.utils import uuid
 
-from celery.tests.case import AppCase
+from celery.tests.case import AppCase, Mock, SkipTest, patch
 
 
 class wrapobject(object):

celery/tests/backends/test_cache.py

@@ -6,7 +6,6 @@ import types
 from contextlib import contextmanager
 
 from kombu.utils.encoding import str_to_bytes
-from mock import Mock, patch
 
 from celery import signature
 from celery import states
@@ -15,7 +14,9 @@ from celery.exceptions import ImproperlyConfigured
 from celery.five import items, string, text_t
 from celery.utils import uuid
 
-from celery.tests.case import AppCase, mask_modules, reset_modules
+from celery.tests.case import (
+    AppCase, Mock, mask_modules, patch, reset_modules,
+)
 
 
 class SomeClass(object):

celery/tests/backends/test_cassandra.py

@@ -2,12 +2,13 @@ from __future__ import absolute_import
 
 import socket
 
-from mock import Mock
 from pickle import loads, dumps
 
 from celery import states
 from celery.exceptions import ImproperlyConfigured
-from celery.tests.case import AppCase, mock_module, depends_on_current_app
+from celery.tests.case import (
+    AppCase, Mock, mock_module, depends_on_current_app,
+)
 
 
 class Object(object):

celery/tests/backends/test_couchbase.py

@@ -1,13 +1,12 @@
 from __future__ import absolute_import
 
-from mock import MagicMock, Mock, patch, sentinel
-from nose import SkipTest
-
 from celery.backends import couchbase as module
 from celery.backends.couchbase import CouchBaseBackend
 from celery.exceptions import ImproperlyConfigured
 from celery import backends
-from celery.tests.case import AppCase
+from celery.tests.case import (
+    AppCase, MagicMock, Mock, SkipTest, patch, sentinel,
+)
 
 try:
     import couchbase

celery/tests/backends/test_database.py

@@ -2,7 +2,6 @@ from __future__ import absolute_import, unicode_literals
 
 from datetime import datetime
 
-from nose import SkipTest
 from pickle import loads, dumps
 
 from celery import states
@@ -11,6 +10,7 @@ from celery.utils import uuid
 
 from celery.tests.case import (
     AppCase,
+    SkipTest,
     depends_on_current_app,
     mask_modules,
     skip_if_pypy,

celery/tests/backends/test_mongodb.py

@@ -3,15 +3,16 @@ from __future__ import absolute_import
 import datetime
 import uuid
 
-from mock import MagicMock, Mock, patch, sentinel
-from nose import SkipTest
 from pickle import loads, dumps
 
 from celery import states
 from celery.backends import mongodb as module
 from celery.backends.mongodb import MongoBackend, Bunch, pymongo
 from celery.exceptions import ImproperlyConfigured
-from celery.tests.case import AppCase, depends_on_current_app
+from celery.tests.case import (
+    AppCase, MagicMock, Mock, SkipTest,
+    depends_on_current_app, patch, sentinel,
+)
 
 COLLECTION = 'taskmeta_celery'
 TASK_ID = str(uuid.uuid1())

celery/tests/backends/test_redis.py

@@ -2,8 +2,6 @@ from __future__ import absolute_import
 
 from datetime import timedelta
 
-from mock import Mock, patch
-from nose import SkipTest
 from pickle import loads, dumps
 
 from kombu.utils import cached_property, uuid
@@ -14,7 +12,9 @@ from celery.datastructures import AttributeDict
 from celery.exceptions import ImproperlyConfigured
 from celery.utils.timeutils import timedelta_seconds
 
-from celery.tests.case import AppCase, depends_on_current_app
+from celery.tests.case import (
+    AppCase, Mock, SkipTest, depends_on_current_app, patch,
+)
 
 
 class Redis(object):

celery/tests/backends/test_rpc.py

@@ -1,11 +1,9 @@
 from __future__ import absolute_import
 
-from mock import patch
-
 from celery.backends.rpc import RPCBackend
 from celery._state import _task_stack
 
-from celery.tests.case import AppCase, Mock
+from celery.tests.case import AppCase, Mock, patch
 
 
 class test_RPCBackend(AppCase):

celery/tests/bin/test_amqp.py

@@ -1,7 +1,5 @@
 from __future__ import absolute_import
 
-from mock import Mock, patch
-
 from celery.bin.amqp import (
     AMQPAdmin,
     AMQShell,
@@ -10,7 +8,7 @@ from celery.bin.amqp import (
     main,
 )
 
-from celery.tests.case import AppCase, WhateverIO
+from celery.tests.case import AppCase, Mock, WhateverIO, patch
 
 
 class test_AMQShell(AppCase):

celery/tests/bin/test_base.py

@@ -2,8 +2,6 @@ from __future__ import absolute_import
 
 import os
 
-from mock import Mock, patch
-
 from celery.bin.base import (
     Command,
     Option,
@@ -11,7 +9,7 @@ from celery.bin.base import (
     HelpFormatter,
 )
 from celery.tests.case import (
-    AppCase, override_stdouts, depends_on_current_app,
+    AppCase, Mock, depends_on_current_app, override_stdouts, patch,
 )
 
 

celery/tests/bin/test_beat.py

@@ -5,14 +5,12 @@ import sys
 
 from collections import defaultdict
 
-from mock import patch
-
 from celery import beat
 from celery import platforms
 from celery.bin import beat as beat_bin
 from celery.apps import beat as beatapp
 
-from celery.tests.case import AppCase, Mock, restore_logging
+from celery.tests.case import AppCase, Mock, patch, restore_logging
 from kombu.tests.case import redirect_stdouts
 
 

celery/tests/bin/test_celery.py

@@ -4,7 +4,6 @@ import sys
 
 from anyjson import dumps
 from datetime import datetime
-from mock import Mock, patch
 
 from celery import __main__
 from celery.platforms import EX_FAILURE, EX_USAGE, EX_OK
@@ -29,7 +28,9 @@ from celery.bin.celery import (
     command,
 )
 
-from celery.tests.case import AppCase, WhateverIO, override_stdouts
+from celery.tests.case import (
+    AppCase, Mock, WhateverIO, override_stdouts, patch,
+)
 
 
 class test__main__(AppCase):

celery/tests/bin/test_celeryd_detach.py

@@ -1,7 +1,5 @@
 from __future__ import absolute_import
 
-from mock import Mock, patch
-
 from celery.platforms import IS_WINDOWS
 from celery.bin.celeryd_detach import (
     detach,
@@ -9,7 +7,7 @@ from celery.bin.celeryd_detach import (
     main,
 )
 
-from celery.tests.case import AppCase, override_stdouts
+from celery.tests.case import AppCase, Mock, override_stdouts, patch
 
 
 if not IS_WINDOWS:

celery/tests/bin/test_celeryevdump.py

@@ -1,6 +1,5 @@
 from __future__ import absolute_import
 
-from mock import Mock, patch
 from time import time
 
 from celery.events.dumper import (
@@ -9,7 +8,7 @@ from celery.events.dumper import (
     evdump,
 )
 
-from celery.tests.case import AppCase, WhateverIO
+from celery.tests.case import AppCase, Mock, WhateverIO, patch
 
 
 class test_Dumper(AppCase):

celery/tests/bin/test_events.py

@@ -1,11 +1,8 @@
 from __future__ import absolute_import
 
-from nose import SkipTest
-from mock import patch as mpatch
-
 from celery.bin import events
 
-from celery.tests.case import AppCase, _old_patch as patch
+from celery.tests.case import AppCase, SkipTest, patch, _old_patch
 
 
 class MockCommand(object):
@@ -25,8 +22,9 @@ class test_events(AppCase):
     def setup(self):
         self.ev = events.events(app=self.app)
 
-    @patch('celery.events.dumper', 'evdump', lambda **kw: 'me dumper, you?')
-    @patch('celery.bin.events', 'set_process_title', proctitle)
+    @_old_patch('celery.events.dumper', 'evdump',
+                lambda **kw: 'me dumper, you?')
+    @_old_patch('celery.bin.events', 'set_process_title', proctitle)
     def test_run_dump(self):
         self.assertEqual(self.ev.run(dump=True), 'me dumper, you?')
         self.assertIn('celery events:dump', proctitle.last[0])
@@ -37,15 +35,17 @@ class test_events(AppCase):
         except ImportError:
             raise SkipTest('curses monitor requires curses')
 
-        @patch('celery.events.cursesmon', 'evtop', lambda **kw: 'me top, you?')
-        @patch('celery.bin.events', 'set_process_title', proctitle)
+        @_old_patch('celery.events.cursesmon', 'evtop',
+                    lambda **kw: 'me top, you?')
+        @_old_patch('celery.bin.events', 'set_process_title', proctitle)
         def _inner():
             self.assertEqual(self.ev.run(), 'me top, you?')
             self.assertIn('celery events:top', proctitle.last[0])
         return _inner()
 
-    @patch('celery.events.snapshot', 'evcam', lambda *a, **k: (a, k))
-    @patch('celery.bin.events', 'set_process_title', proctitle)
+    @_old_patch('celery.events.snapshot', 'evcam',
+                lambda *a, **k: (a, k))
+    @_old_patch('celery.bin.events', 'set_process_title', proctitle)
     def test_run_cam(self):
         a, kw = self.ev.run(camera='foo.bar.baz', logfile='logfile')
         self.assertEqual(a[0], 'foo.bar.baz')
@@ -55,8 +55,8 @@ class test_events(AppCase):
         self.assertEqual(kw['logfile'], 'logfile')
         self.assertIn('celery events:cam', proctitle.last[0])
 
-    @mpatch('celery.events.snapshot.evcam')
-    @mpatch('celery.bin.events.detached')
+    @patch('celery.events.snapshot.evcam')
+    @patch('celery.bin.events.detached')
     def test_run_cam_detached(self, detached, evcam):
         self.ev.prog_name = 'celery events'
         self.ev.run_evcam('myapp.Camera', detach=True)
@@ -66,7 +66,7 @@ class test_events(AppCase):
     def test_get_options(self):
         self.assertTrue(self.ev.get_options())
 
-    @patch('celery.bin.events', 'events', MockCommand)
+    @_old_patch('celery.bin.events', 'events', MockCommand)
     def test_main(self):
         MockCommand.executed = []
         events.main()

celery/tests/bin/test_multi.py

@@ -4,8 +4,6 @@ import errno
 import signal
 import sys
 
-from mock import Mock, patch
-
 from celery.bin.multi import (
     main,
     MultiTool,
@@ -19,7 +17,7 @@ from celery.bin.multi import (
     __doc__ as doc,
 )
 
-from celery.tests.case import AppCase, WhateverIO, SkipTest
+from celery.tests.case import AppCase, Mock, WhateverIO, SkipTest, patch
 
 
 class test_functions(AppCase):

celery/tests/bin/test_worker.py

@@ -6,9 +6,6 @@ import sys
 
 from functools import wraps
 
-from mock import Mock, patch
-from nose import SkipTest
-
 from billiard import current_process
 from kombu import Exchange, Queue
 
@@ -23,7 +20,10 @@ from celery.worker import state
 
 from celery.tests.case import (
     AppCase,
+    Mock,
+    SkipTest,
     WhateverIO,
+    patch,
     skip_if_pypy,
     skip_if_jython,
 )

celery/tests/case.py

@@ -45,7 +45,8 @@ from celery.utils.functional import noop
 from celery.utils.imports import qualname
 
 __all__ = [
-    'Case', 'AppCase', 'Mock', 'patch', 'call', 'skip_unless_module',
+    'Case', 'AppCase', 'Mock', 'MagicMock',
+    'patch', 'call', 'sentinel', 'skip_unless_module',
     'wrap_logger', 'with_environ', 'sleepdeprived',
     'skip_if_environ', 'todo', 'skip', 'skip_if',
     'skip_unless', 'mask_modules', 'override_stdouts', 'mock_module',
@@ -56,6 +57,8 @@ __all__ = [
 ]
 patch = mock.patch
 call = mock.call
+sentinel = mock.sentinel
+MagicMock = mock.MagicMock
 
 CASE_REDEFINES_SETUP = """\
 {name} (subclass of AppCase) redefines private "setUp", should be: "setup"\

celery/tests/compat_modules/test_sets.py

@@ -3,15 +3,13 @@ from __future__ import absolute_import
 import anyjson
 import warnings
 
-from mock import Mock, patch
-
 from celery import uuid
 from celery.result import TaskSetResult
 from celery.task import Task
 from celery.canvas import Signature
 
 from celery.tests.tasks.test_result import make_mock_group
-from celery.tests.case import AppCase
+from celery.tests.case import AppCase, Mock, patch
 
 
 class SetsCase(AppCase):

celery/tests/concurrency/test_concurrency.py

@@ -3,10 +3,9 @@ from __future__ import absolute_import
 import os
 
 from itertools import count
-from mock import Mock
 
 from celery.concurrency.base import apply_target, BasePool
-from celery.tests.case import AppCase
+from celery.tests.case import AppCase, Mock
 
 
 class test_BasePool(AppCase):

celery/tests/concurrency/test_eventlet.py

@@ -2,9 +2,6 @@ from __future__ import absolute_import
 
 import sys
 
-from nose import SkipTest
-from mock import patch, Mock
-
 from celery.app.defaults import is_pypy
 from celery.concurrency.eventlet import (
     apply_target,
@@ -13,7 +10,9 @@ from celery.concurrency.eventlet import (
     TaskPool,
 )
 
-from celery.tests.case import AppCase, mock_module, patch_many, skip_if_pypy
+from celery.tests.case import (
+    AppCase, Mock, SkipTest, mock_module, patch, patch_many, skip_if_pypy,
+)
 
 
 class EventletCase(AppCase):

celery/tests/concurrency/test_gevent.py

@@ -1,8 +1,5 @@
 from __future__ import absolute_import
 
-from nose import SkipTest
-from mock import Mock
-
 from celery.concurrency.gevent import (
     Schedule,
     Timer,
@@ -11,7 +8,7 @@ from celery.concurrency.gevent import (
 )
 
 from celery.tests.case import (
-    AppCase, mock_module, patch, patch_many, skip_if_pypy,
+    AppCase, Mock, SkipTest, mock_module, patch, patch_many, skip_if_pypy,
 )
 
 gevent_modules = (

celery/tests/concurrency/test_pool.py

@@ -3,11 +3,9 @@ from __future__ import absolute_import
 import time
 import itertools
 
-from nose import SkipTest
-
 from billiard.einfo import ExceptionInfo
 
-from celery.tests.case import AppCase
+from celery.tests.case import AppCase, SkipTest
 
 
 def do_something(i):

celery/tests/concurrency/test_prefork.py

@@ -6,12 +6,9 @@ import time
 
 from itertools import cycle
 
-from mock import Mock, call, patch
-from nose import SkipTest
-
 from celery.five import items, range
 from celery.utils.functional import noop
-from celery.tests.case import AppCase
+from celery.tests.case import AppCase, Mock, SkipTest, call, patch
 try:
     from celery.concurrency import prefork as mp
     from celery.concurrency import asynpool

celery/tests/concurrency/test_threads.py

@@ -1,10 +1,8 @@
 from __future__ import absolute_import
 
-from mock import Mock
-
 from celery.concurrency.threads import NullDict, TaskPool, apply_target
 
-from celery.tests.case import AppCase, Case, mask_modules, mock_module
+from celery.tests.case import AppCase, Case, Mock, mask_modules, mock_module
 
 
 class test_NullDict(Case):

celery/tests/contrib/test_migrate.py

@@ -1,7 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
 from contextlib import contextmanager
-from mock import patch
 
 from amqp import ChannelError
 
@@ -27,7 +26,7 @@ from celery.contrib.migrate import (
     move,
 )
 from celery.utils.encoding import bytes_t, ensure_bytes
-from celery.tests.case import AppCase, Mock, override_stdouts
+from celery.tests.case import AppCase, Mock, override_stdouts, patch
 
 # hack to ignore error at shutdown
 QoS.restore_at_shutdown = False

celery/tests/contrib/test_rdb.py

@@ -3,14 +3,12 @@ from __future__ import absolute_import
 import errno
 import socket
 
-from mock import Mock, patch
-
 from celery.contrib.rdb import (
     Rdb,
     debugger,
     set_trace,
 )
-from celery.tests.case import Case, WhateverIO, skip_if_pypy
+from celery.tests.case import Case, Mock, WhateverIO, patch, skip_if_pypy
 
 
 class SockErr(socket.error):

celery/tests/events/test_cursesmon.py

@@ -1,8 +1,6 @@
 from __future__ import absolute_import
 
-from nose import SkipTest
-
-from celery.tests.case import AppCase
+from celery.tests.case import AppCase, SkipTest
 
 
 class MockWindow(object):

celery/tests/events/test_events.py

@@ -2,10 +2,8 @@ from __future__ import absolute_import
 
 import socket
 
-from mock import Mock
-
 from celery.events import Event
-from celery.tests.case import AppCase
+from celery.tests.case import AppCase, Mock
 
 
 class MockProducer(object):

celery/tests/events/test_snapshot.py

@@ -1,10 +1,8 @@
 from __future__ import absolute_import
 
-from mock import patch
-
 from celery.events import Events
 from celery.events.snapshot import Polaroid, evcam
-from celery.tests.case import AppCase, restore_logging
+from celery.tests.case import AppCase, patch, restore_logging
 
 
 class TRef(object):

celery/tests/events/test_state.py

@@ -5,7 +5,6 @@ import pickle
 from random import shuffle
 from time import time
 from itertools import count
-from mock import patch
 
 from celery import states
 from celery.events import Event
@@ -18,7 +17,7 @@ from celery.events.state import (
 )
 from celery.five import range
 from celery.utils import uuid
-from celery.tests.case import AppCase
+from celery.tests.case import AppCase, patch
 
 
 class replay(object):

celery/tests/fixups/test_django.py

@@ -3,7 +3,6 @@ from __future__ import absolute_import
 import os
 
 from contextlib import contextmanager
-from mock import Mock, patch
 
 from celery.fixups.django import (
     _maybe_close_fd,
@@ -11,7 +10,9 @@ from celery.fixups.django import (
     DjangoFixup,
 )
 
-from celery.tests.case import AppCase, patch_many, patch_modules, mask_modules
+from celery.tests.case import (
+    AppCase, Mock, patch, patch_many, patch_modules, mask_modules,
+)
 
 
 class test_DjangoFixup(AppCase):

celery/tests/security/case.py

@@ -1,8 +1,6 @@
 from __future__ import absolute_import
 
-from nose import SkipTest
-
-from celery.tests.case import AppCase
+from celery.tests.case import AppCase, SkipTest
 
 
 class SecurityCase(AppCase):

celery/tests/security/test_certificate.py

@@ -3,12 +3,10 @@ from __future__ import absolute_import
 from celery.exceptions import SecurityError
 from celery.security.certificate import Certificate, CertStore, FSCertStore
 
-from mock import Mock, patch
-
 from . import CERT1, CERT2, KEY1
 from .case import SecurityCase
 
-from celery.tests.case import mock_open
+from celery.tests.case import Mock, mock_open, patch
 
 
 class test_Certificate(SecurityCase):

celery/tests/security/test_security.py

@@ -16,8 +16,6 @@ Generated with:
 """
 from __future__ import absolute_import
 
-from mock import Mock, patch
-
 from kombu.serialization import disable_insecure_serializers
 
 from celery.exceptions import ImproperlyConfigured, SecurityError
@@ -27,7 +25,7 @@ from kombu.serialization import registry
 
 from .case import SecurityCase
 
-from celery.tests.case import mock_open
+from celery.tests.case import Mock, mock_open, patch
 
 
 class test_security(SecurityCase):

celery/tests/tasks/test_canvas.py

@@ -1,7 +1,5 @@
 from __future__ import absolute_import
 
-from mock import Mock
-
 from celery.canvas import (
     Signature,
     chain,
@@ -16,7 +14,7 @@ from celery.canvas import (
 )
 from celery.result import EagerResult
 
-from celery.tests.case import AppCase
+from celery.tests.case import AppCase, Mock
 
 SIG = Signature({'task': 'TASK',
                  'args': ('A1', ),

celery/tests/tasks/test_result.py

@@ -1,7 +1,6 @@
 from __future__ import absolute_import
 
 from contextlib import contextmanager
-from mock import Mock, patch
 
 from celery import states
 from celery.exceptions import IncompleteStream, TimeoutError
@@ -15,7 +14,7 @@ from celery.result import (
 from celery.utils import uuid
 from celery.utils.serialization import pickle
 
-from celery.tests.case import AppCase, depends_on_current_app
+from celery.tests.case import AppCase, Mock, depends_on_current_app, patch
 
 
 def mock_task(name, state, result):

celery/tests/tasks/test_tasks.py

@@ -2,7 +2,6 @@ from __future__ import absolute_import
 
 from collections import Callable
 from datetime import datetime, timedelta
-from mock import patch
 
 from kombu import Queue
 
@@ -14,7 +13,7 @@ from celery.result import EagerResult
 from celery.utils import uuid
 from celery.utils.timeutils import parse_iso8601
 
-from celery.tests.case import AppCase, depends_on_current_app
+from celery.tests.case import AppCase, depends_on_current_app, patch
 
 
 def return_True(*args, **kwargs):

celery/tests/tasks/test_trace.py

@@ -1,7 +1,5 @@
 from __future__ import absolute_import
 
-from mock import Mock, patch
-
 from celery import uuid
 from celery import signals
 from celery import states
@@ -13,7 +11,7 @@ from celery.app.trace import (
     setup_worker_optimizations,
     reset_worker_optimizations,
 )
-from celery.tests.case import AppCase
+from celery.tests.case import AppCase, Mock, patch
 
 
 def trace(app, task, args=(), kwargs={}, propagate=False, **opts):

celery/tests/utils/test_datastructures.py

@@ -4,7 +4,6 @@ import pickle
 import sys
 
 from billiard.einfo import ExceptionInfo
-from mock import Mock, patch
 from time import time
 
 from celery.datastructures import (
@@ -16,7 +15,7 @@ from celery.datastructures import (
 )
 from celery.five import items
 
-from celery.tests.case import Case, WhateverIO, SkipTest
+from celery.tests.case import Case, Mock, WhateverIO, SkipTest, patch
 
 
 class Object(object):

celery/tests/utils/test_imports.py

@@ -1,7 +1,5 @@
 from __future__ import absolute_import
 
-from mock import Mock, patch
-
 from celery.utils.imports import (
     qualname,
     reload_from_cwd,
@@ -10,7 +8,7 @@ from celery.utils.imports import (
     NotAPackage,
 )
 
-from celery.tests.case import Case
+from celery.tests.case import Case, Mock, patch
 
 
 class test_import_utils(Case):

celery/tests/utils/test_local.py

@@ -2,8 +2,6 @@ from __future__ import absolute_import, unicode_literals
 
 import sys
 
-from mock import Mock
-
 from celery.five import string, long_t
 from celery.local import (
     Proxy,
@@ -11,7 +9,7 @@ from celery.local import (
     maybe_evaluate,
     try_import,
 )
-from celery.tests.case import Case
+from celery.tests.case import Case, Mock
 
 
 class test_try_import(Case):

celery/tests/utils/test_mail.py

@@ -1,10 +1,8 @@
 from __future__ import absolute_import
 
-from mock import Mock, patch
-
 from celery.utils.mail import Message, Mailer, SSLError
 
-from celery.tests.case import Case
+from celery.tests.case import Case, Mock, patch
 
 
 msg = Message(to='george@vandelay.com', sender='elaine@pendant.com',

celery/tests/utils/test_platforms.py

@@ -5,8 +5,6 @@ import os
 import sys
 import signal
 
-from mock import Mock, patch, call
-
 from celery import _find_option_with_arg
 from celery import platforms
 from celery.five import open_fqdn
@@ -37,7 +35,8 @@ except ImportError:  # pragma: no cover
     resource = None  # noqa
 
 from celery.tests.case import (
-    Case, WhateverIO, override_stdouts, mock_open, SkipTest,
+    Case, WhateverIO, Mock, SkipTest,
+    call, override_stdouts, mock_open, patch,
 )
 
 

celery/tests/utils/test_sysinfo.py

@@ -2,12 +2,9 @@ from __future__ import absolute_import
 
 import os
 
-from mock import patch
-from nose import SkipTest
-
 from celery.utils.sysinfo import load_average, df
 
-from celery.tests.case import Case
+from celery.tests.case import Case, SkipTest, patch
 
 
 class test_load_average(Case):

celery/tests/utils/test_threads.py

@@ -1,7 +1,5 @@
 from __future__ import absolute_import
 
-from mock import patch
-
 from celery.utils.threads import (
     _LocalStack,
     _FastLocalStack,
@@ -10,7 +8,7 @@ from celery.utils.threads import (
     bgThread,
 )
 
-from celery.tests.case import Case, override_stdouts
+from celery.tests.case import Case, override_stdouts, patch
 
 
 class test_bgThread(Case):

celery/tests/utils/test_timeutils.py

@@ -3,7 +3,6 @@ from __future__ import absolute_import
 import pytz
 
 from datetime import datetime, timedelta, tzinfo
-from mock import Mock, patch
 from pytz import AmbiguousTimeError
 
 from celery.utils.timeutils import (
@@ -23,7 +22,7 @@ from celery.utils.timeutils import (
     utcoffset,
 )
 from celery.utils.iso8601 import parse_iso8601
-from celery.tests.case import Case
+from celery.tests.case import Case, Mock, patch
 
 
 class test_LocalTimezone(Case):

celery/tests/utils/test_utils.py

@@ -3,7 +3,6 @@ from __future__ import absolute_import
 import pytz
 
 from datetime import datetime, date, time, timedelta
-from mock import Mock, patch
 
 from kombu import Queue
 
@@ -16,7 +15,7 @@ from celery.utils import (
     gen_task_name,
     jsonify,
 )
-from celery.tests.case import Case
+from celery.tests.case import Case, Mock, patch
 
 
 def double(x):

celery/tests/worker/test_autoreload.py

@@ -4,7 +4,6 @@ import errno
 import select
 import sys
 
-from mock import Mock, patch
 from time import time
 
 from celery.worker import autoreload
@@ -19,7 +18,7 @@ from celery.worker.autoreload import (
     Autoreloader,
 )
 
-from celery.tests.case import AppCase, Case, mock_open
+from celery.tests.case import AppCase, Case, Mock, patch, mock_open
 
 
 class test_WorkerComponent(AppCase):

celery/tests/worker/test_autoscale.py

@@ -2,13 +2,11 @@ from __future__ import absolute_import
 
 import sys
 
-from mock import Mock, patch
-
 from celery.concurrency.base import BasePool
 from celery.five import monotonic
 from celery.worker import state
 from celery.worker import autoscale
-from celery.tests.case import AppCase, sleepdeprived
+from celery.tests.case import AppCase, Mock, patch, sleepdeprived
 
 
 class Object(object):

celery/tests/worker/test_bootsteps.py

@@ -1,10 +1,8 @@
 from __future__ import absolute_import
 
-from mock import Mock, patch
-
 from celery import bootsteps
 
-from celery.tests.case import AppCase
+from celery.tests.case import AppCase, Mock, patch
 
 
 class test_StepFormatter(AppCase):

celery/tests/worker/test_components.py

@@ -4,14 +4,12 @@ from __future__ import absolute_import
 # here to complete coverage.  Should move everyting to this module at some
 # point [-ask]
 
-from mock import Mock
-
 from celery.worker.components import (
     Queues,
     Pool,
 )
 
-from celery.tests.case import AppCase
+from celery.tests.case import AppCase, Mock
 
 
 class test_Queues(AppCase):

celery/tests/worker/test_consumer.py

@@ -3,9 +3,6 @@ from __future__ import absolute_import
 import errno
 import socket
 
-from mock import Mock, patch, call
-from nose import SkipTest
-
 from billiard.exceptions import RestartFreqExceeded
 
 from celery.datastructures import LimitedSet
@@ -21,7 +18,7 @@ from celery.worker.consumer import (
     CLOSE,
 )
 
-from celery.tests.case import AppCase
+from celery.tests.case import AppCase, Mock, SkipTest, call, patch
 
 
 class test_Consumer(AppCase):

celery/tests/worker/test_control.py

@@ -7,7 +7,6 @@ from collections import defaultdict
 from datetime import datetime, timedelta
 
 from kombu import pidbox
-from mock import Mock, patch, call
 
 from celery.datastructures import AttributeDict
 from celery.five import Queue as FastQueue
@@ -22,7 +21,7 @@ from celery.worker.state import revoked
 from celery.worker.control import Panel
 from celery.worker.pidbox import Pidbox, gPidbox
 
-from celery.tests.case import AppCase
+from celery.tests.case import AppCase, Mock, call, patch
 
 hostname = socket.gethostname()
 

celery/tests/worker/test_hub.py

@@ -4,10 +4,8 @@ from kombu.async import Hub, READ, WRITE, ERR
 from kombu.async.hub import repr_flag, _rcb
 from kombu.async.semaphore import DummyLock, LaxBoundedSemaphore
 
-from mock import Mock, call, patch
-
 from celery.five import range
-from celery.tests.case import Case
+from celery.tests.case import Case, Mock, call, patch
 
 
 class File(object):

celery/tests/worker/test_loops.py

@@ -2,8 +2,6 @@ from __future__ import absolute_import
 
 import socket
 
-from mock import Mock
-
 from kombu.async import Hub, READ, WRITE, ERR
 
 from celery.bootsteps import CLOSE, RUN
@@ -13,7 +11,7 @@ from celery.worker import state
 from celery.worker.consumer import Consumer
 from celery.worker.loops import asynloop, synloop
 
-from celery.tests.case import AppCase, body_from_sig
+from celery.tests.case import AppCase, Mock, body_from_sig
 
 
 class X(object):

celery/tests/worker/test_request.py

@@ -12,8 +12,6 @@ from datetime import datetime, timedelta
 from billiard.einfo import ExceptionInfo
 from kombu.transport.base import Message
 from kombu.utils.encoding import from_utf8, default_encode
-from mock import Mock, patch
-from nose import SkipTest
 
 from celery import states
 from celery.app.trace import (
@@ -44,8 +42,11 @@ from celery.worker.state import revoked
 from celery.tests.case import (
     AppCase,
     Case,
+    Mock,
+    SkipTest,
     assert_signal_called,
     body_from_sig,
+    patch,
 )
 
 

celery/tests/worker/test_state.py

@@ -2,14 +2,13 @@ from __future__ import absolute_import
 
 import pickle
 
-from mock import Mock, patch
 from time import time
 
 from celery.datastructures import LimitedSet
 from celery.exceptions import SystemTerminate
 from celery.worker import state
 
-from celery.tests.case import AppCase
+from celery.tests.case import AppCase, Mock, patch
 
 
 class StateResetCase(AppCase):

celery/tests/worker/test_strategy.py

@@ -2,14 +2,13 @@ from __future__ import absolute_import
 
 from collections import defaultdict
 from contextlib import contextmanager
-from mock import Mock, patch
 
 from kombu.utils.limits import TokenBucket
 
 from celery.worker import state
 from celery.utils.timeutils import rate
 
-from celery.tests.case import AppCase, body_from_sig
+from celery.tests.case import AppCase, Mock, patch, body_from_sig
 
 
 class test_default_strategy(AppCase):

celery/tests/worker/test_worker.py

@@ -11,7 +11,6 @@ from amqp import ChannelError
 from kombu import Connection
 from kombu.common import QoS, ignore_errors
 from kombu.transport.base import Message
-from mock import Mock, patch
 
 from celery.app.defaults import DEFAULTS
 from celery.bootsteps import RUN, CLOSE, StartStopStep
@@ -28,7 +27,7 @@ from celery.utils import worker_direct
 from celery.utils.serialization import pickle
 from celery.utils.timer2 import Timer
 
-from celery.tests.case import AppCase, restore_logging
+from celery.tests.case import AppCase, Mock, patch, restore_logging
 
 
 def MockStep(step=None):

funtests/suite/test_basic.py

@@ -8,7 +8,7 @@ sys.path.insert(0, os.path.join(os.getcwd(), os.pardir))
 import suite  # noqa
 
 from celery.five import range
-from celery.tests.utils import unittest
+from celery.tests.case import unittest
 from celery.tests.functional import tasks
 from celery.tests.functional.case import WorkerCase
 

funtests/suite/test_leak.py

@@ -9,11 +9,9 @@ import subprocess
 sys.path.insert(0, os.getcwd())
 sys.path.insert(0, os.path.join(os.getcwd(), os.pardir))
 
-from nose import SkipTest
-
 from celery import current_app
 from celery.five import range
-from celery.tests.utils import unittest
+from celery.tests.case import SkipTest, unittest
 
 import suite  # noqa
 

requirements/test.txt

@@ -1,4 +1,4 @@
-unittest2>=0.4.0
+unittest2>=0.5.1
 nose
 nose-cover3
-mock
+mock>=1.0.1

requirements/test3.txt

@@ -1,3 +1,2 @@
 nose
 nose-cover3
-mock