瀏覽代碼

Fixes tests

Ask Solem 9 年之前
父節點
當前提交
4d998d17d9
共有 2 個文件被更改,包括 4 次插入3 次删除
  1. 2 1
      celery/__init__.py
  2. 2 2
      celery/tests/worker/test_loops.py

+ 2 - 1
celery/__init__.py

@@ -94,7 +94,8 @@ def _patch_eventlet():
 
     eventlet.monkey_patch()
     blockdetect = float(os.environ.get('EVENTLET_NOBLOCK', 0))
-    eventlet.debug.hub_blocking_detection(blockdetect, blockdetect)
+    if blockdetect:
+        eventlet.debug.hub_blocking_detection(blockdetect, blockdetect)
 
 def _patch_gevent():
     from gevent import monkey, signal as gsignal, version_info

+ 2 - 2
celery/tests/worker/test_loops.py

@@ -10,7 +10,7 @@ from celery.five import Empty
 from celery.platforms import EX_FAILURE
 from celery.worker import state
 from celery.worker.consumer import Consumer
-from celery.worker.loops import asynloop, synloop
+from celery.worker.loops import _quick_drain, asynloop, synloop
 
 from celery.tests.case import AppCase, Mock, task_message_from_sig
 
@@ -126,7 +126,7 @@ class test_asynloop(AppCase):
     def test_drain_after_consume(self):
         x, _ = get_task_callback(self.app, transport_driver_type='amqp')
         self.assertIn(
-            x.connection.drain_events, [p.fun for p in x.hub._ready],
+            _quick_drain, [p.fun for p in x.hub._ready],
         )
 
     def test_setup_heartbeat(self):