Ver código fonte

Unittests: Don't emit logging in test output

Ask Solem 14 anos atrás
pai
commit
b97de622af
3 arquivos alterados com 7 adições e 4 exclusões
  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
 :status: in-progress
 :branch: app
-=======
 
 .. _version-2.1.0:
 

+ 4 - 0
celery/tests/__init__.py

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

+ 3 - 3
celery/tests/test_worker.py

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