Replace NotImplemented to NotImplementedError, and fix test_send_worker_shutting_down_signal test case with additional patch on active_thread_count function in celery.apps.worker module.

Author: 余森彬

celery/concurrency/future.py

@@ -116,11 +116,11 @@ class greenFutureExecutor(defaultFutureExecutor):
 
     @classmethod
     def getcurrent(cls):
-        raise NotImplemented()
+        raise NotImplementedError()
 
     @classmethod
     def get_greentlet_hub(cls):
-        raise NotImplemented()
+        raise NotImplementedError()
 
     @classmethod
     def apply_future(cls, func, *args, **kwargs):

requirements/test.txt

@@ -1,4 +1,5 @@
 case>=1.3.1
 pytest>=3.0
 pytest_localserver>=0.3.7
+pytest-mock>=1.6.2
 tornado>=4.0.0

t/unit/bin/test_worker.py

@@ -644,10 +644,14 @@ def test_worker_term_hard_handler_when_single_threaded(self):
             with pytest.raises(WorkerTerminate):
                 handlers['SIGQUIT']('SIGQUIT', object())
 
-    def test_send_worker_shutting_down_signal(self):
-        with patch('celery.apps.worker.signals.worker_shutting_down') as wsd:
+    def test_send_worker_shutting_down_signal(self, mocker):
+        with patch('celery.signals.worker_shutting_down') as wsd:
             worker = self._Worker()
             handlers = self.psig(cd.install_worker_term_handler, worker)
+            active_thread_count = mocker.patch(
+                'celery.apps.worker.active_thread_count')
+            active_thread_count.return_value = 1
+
             try:
                 with pytest.raises(WorkerShutdown):
                     handlers['SIGTERM']('SIGTERM', object())