Ask Solem 11 years ago
parent
commit
982e488bec

+ 2 - 2
celery/tests/app/test_log.py

@@ -200,8 +200,8 @@ class test_default_logger(AppCase):
 
             with override_stdouts() as outs:
                 stdout, stderr = outs
-                l = self.setup_logger(logfile=sys.stderr, loglevel=logging.INFO,
-                                      root=False)
+                l = self.setup_logger(logfile=sys.stderr,
+                                      loglevel=logging.INFO, root=False)
                 l.info('The quick brown fox...')
                 self.assertIn('The quick brown fox...', stderr.getvalue())
 

+ 4 - 3
celery/tests/tasks/test_tasks.py

@@ -1276,9 +1276,10 @@ class test_crontab_is_due(AppCase):
         due, remaining = monthly_moy.run_every.is_due(
             datetime(2013, 6, 28, 22, 14))
         self.assertFalse(due)
-        attempt = (time.mktime(datetime(2014, 2, 26, 22, 0).timetuple())
-                   - time.mktime(datetime(2013, 6, 28, 14, 30).timetuple())
-                   - 60 * 60
+        attempt = (
+            time.mktime(datetime(2014, 2, 26, 22, 0).timetuple()) -
+            time.mktime(datetime(2013, 6, 28, 14, 30).timetuple()) -
+            60 * 60
         )
         self.assertEqual(remaining, attempt)
 

+ 0 - 5
celery/tests/utils/test_encoding.py

@@ -1,10 +1,5 @@
 from __future__ import absolute_import, unicode_literals
 
-import sys
-
-from nose import SkipTest
-
-from celery.five import string
 from celery.utils import encoding
 from celery.tests.case import Case
 

+ 1 - 3
celery/tests/worker/test_worker.py

@@ -884,7 +884,7 @@ class test_WorkController(AppCase):
             from celery._state import _tls
             from celery.concurrency.processes import process_initializer
             from celery.concurrency.processes import (WORKER_SIGRESET,
-                                                    WORKER_SIGIGNORE)
+                                                      WORKER_SIGIGNORE)
 
             def on_worker_process_init(**kwargs):
                 on_worker_process_init.called = True
@@ -1193,8 +1193,6 @@ class test_WorkController(AppCase):
         ])
 
         result = Mock()
-        tref = result._tref
-
         poolimp.on_timeout_cancel(result)
         poolimp.on_timeout_cancel(result)  # no more tref