Ver código fonte

Unittests: Don't emit logging in test output

Ask Solem 14 anos atrás
pai
commit
4ec6f44ec7
3 arquivos alterados com 9 adições e 3 exclusões
  1. 2 0
      Changelog
  2. 4 0
      celery/tests/__init__.py
  3. 3 3
      celery/tests/test_worker.py

+ 2 - 0
Changelog

@@ -58,6 +58,8 @@ Fixes
   to ``cache.set`` is deprecated by the memcached libraries,
   so we now automatically cast to :class:`int`.
 
+* unittests: No longer emits logging and warnings in test output.
+
 News
 ----
 

+ 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,7 +2,6 @@ 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
@@ -10,6 +9,7 @@ from carrot.connection import BrokerConnection
 from celery.utils.timer2 import Timer
 
 from celery import conf
+from celery import log
 from celery.decorators import task as task_dec
 from celery.decorators import periodic_task as periodic_task_dec
 from celery.serialization import pickle
@@ -155,7 +155,7 @@ class test_QoS(unittest.TestCase):
 
     def test_decrement(self):
         consumer = self.MockConsumer()
-        qos = QoS(consumer, 10, get_logger())
+        qos = QoS(consumer, 10, log.get_default_logger())
         qos.update()
         self.assertEqual(int(qos.value), 10)
         self.assertEqual(consumer.prefetch_count, 10)
@@ -172,7 +172,7 @@ class test_CarrotListener(unittest.TestCase):
     def setUp(self):
         self.ready_queue = FastQueue()
         self.eta_schedule = Timer()
-        self.logger = get_logger()
+        self.logger = log.get_default_logger()
         self.logger.setLevel(0)
 
     def tearDown(self):