浏览代码

Unittests: Don't emit logging in test output

Ask Solem 14 年之前
父节点
当前提交
b97de622af
共有 3 个文件被更改,包括 7 次插入4 次删除
  1. 0 1
      Changelog
  2. 4 0
      celery/tests/__init__.py
  3. 3 3
      celery/tests/test_worker.py

+ 0 - 1
Changelog

@@ -12,7 +12,6 @@
 :release-date: TBA
 :release-date: TBA
 :status: in-progress
 :status: in-progress
 :branch: app
 :branch: app
-=======
 
 
 .. _version-2.1.0:
 .. _version-2.1.0:
 
 

+ 4 - 0
celery/tests/__init__.py

@@ -1,3 +1,4 @@
+import logging
 import os
 import os
 import sys
 import sys
 
 
@@ -9,6 +10,9 @@ os.environ["CELERY_LOADER"] = "default"
 
 
 
 
 def teardown():
 def teardown():
+    # Don't want SUBDEBUG log messages at finalization.
+    from multiprocessing.util import get_logger
+    get_logger().setLevel(logging.WARNING)
     import threading
     import threading
     import os
     import os
     if os.path.exists("test.db"):
     if os.path.exists("test.db"):

+ 3 - 3
celery/tests/test_worker.py

@@ -2,13 +2,13 @@ import socket
 import unittest2 as unittest
 import unittest2 as unittest
 
 
 from datetime import datetime, timedelta
 from datetime import datetime, timedelta
-from multiprocessing import get_logger
 from Queue import Empty
 from Queue import Empty
 
 
 from carrot.backends.base import BaseMessage
 from carrot.backends.base import BaseMessage
 from carrot.connection import BrokerConnection
 from carrot.connection import BrokerConnection
 from celery.utils.timer2 import Timer
 from celery.utils.timer2 import Timer
 
 
+from celery.app import app_or_default
 from celery.decorators import task as task_dec
 from celery.decorators import task as task_dec
 from celery.decorators import periodic_task as periodic_task_dec
 from celery.decorators import periodic_task as periodic_task_dec
 from celery.serialization import pickle
 from celery.serialization import pickle
@@ -154,7 +154,7 @@ class test_QoS(unittest.TestCase):
 
 
     def test_decrement(self):
     def test_decrement(self):
         consumer = self.MockConsumer()
         consumer = self.MockConsumer()
-        qos = QoS(consumer, 10, get_logger())
+        qos = QoS(consumer, 10, app_or_default().get_default_logger())
         qos.update()
         qos.update()
         self.assertEqual(int(qos.value), 10)
         self.assertEqual(int(qos.value), 10)
         self.assertEqual(consumer.prefetch_count, 10)
         self.assertEqual(consumer.prefetch_count, 10)
@@ -171,7 +171,7 @@ class test_CarrotListener(unittest.TestCase):
     def setUp(self):
     def setUp(self):
         self.ready_queue = FastQueue()
         self.ready_queue = FastQueue()
         self.eta_schedule = Timer()
         self.eta_schedule = Timer()
-        self.logger = get_logger()
+        self.logger = app_or_default().log.get_default_logger()
         self.logger.setLevel(0)
         self.logger.setLevel(0)
 
 
     def tearDown(self):
     def tearDown(self):