Ask Solem преди 13 години
родител
ревизия
6ad52f7268
променени са 3 файла, в които са добавени 6 реда и са изтрити 7 реда
  1. 1 2
      celery/tests/test_worker/__init__.py
  2. 1 1
      celery/tests/test_worker/test_worker_state.py
  3. 4 4
      celery/utils/timeutils.py

+ 1 - 2
celery/tests/test_worker/__init__.py

@@ -861,8 +861,7 @@ class test_WorkController(AppCase):
         state.Persistent = Mock()
         try:
             worker = self.create_worker(db="statefilename")
-            self.assertTrue(worker._finalize_db)
-            worker._finalize_db.cancel()
+            self.assertTrue(worker._persistence)
         finally:
             state.Persistent = Persistent
 

+ 1 - 1
celery/tests/test_worker/test_worker_state.py

@@ -32,7 +32,7 @@ class MockShelve(dict):
     in_sync = False
     closed = False
 
-    def open(self, filename):
+    def open(self, filename, **kwargs):
         self.filename = filename
         return self
 

+ 4 - 4
celery/utils/timeutils.py

@@ -42,12 +42,12 @@ def maybe_timedelta(delta):
 if HAVE_TIMEDELTA_TOTAL_SECONDS:   # pragma: no cover
 
     def timedelta_seconds(delta):
-    """Convert :class:`datetime.timedelta` to seconds.
+        """Convert :class:`datetime.timedelta` to seconds.
 
-    Doesn't account for negative values.
+        Doesn't account for negative values.
 
-    """
-    return max(delta.total_seconds(), 0)
+        """
+        return max(delta.total_seconds(), 0)
 else:  # pragma: no cover
 
     def timedelta_seconds(delta):  # noqa