[CalendarServer-changes] [13600] twext/trunk/twext/enterprise

source_changes at macosforge.org source_changes at macosforge.org
Tue Jun 3 10:23:37 PDT 2014


Revision: 13600
          http://trac.calendarserver.org//changeset/13600
Author:   cdaboo at apple.com
Date:     2014-06-03 10:23:37 -0700 (Tue, 03 Jun 2014)
Log Message:
-----------
Fix intermittent test errors.

Modified Paths:
--------------
    twext/trunk/twext/enterprise/queue.py
    twext/trunk/twext/enterprise/test/test_jobqueue.py
    twext/trunk/twext/enterprise/test/test_queue.py

Modified: twext/trunk/twext/enterprise/queue.py
===================================================================
--- twext/trunk/twext/enterprise/queue.py	2014-06-03 02:20:23 UTC (rev 13599)
+++ twext/trunk/twext/enterprise/queue.py	2014-06-03 17:23:37 UTC (rev 13600)
@@ -1310,6 +1310,9 @@
                     yield peer.performWork(overdueItem.table,
                                            overdueItem.workID)
 
+        if not self.running:
+            return succeed(None)
+
         return inTransaction(self.transactionFactory, workCheck)
 
     _currentWorkDeferred = None

Modified: twext/trunk/twext/enterprise/test/test_jobqueue.py
===================================================================
--- twext/trunk/twext/enterprise/test/test_jobqueue.py	2014-06-03 02:20:23 UTC (rev 13599)
+++ twext/trunk/twext/enterprise/test/test_jobqueue.py	2014-06-03 17:23:37 UTC (rev 13600)
@@ -26,7 +26,8 @@
 from twisted.trial.unittest import TestCase, SkipTest
 from twisted.test.proto_helpers import StringTransport, MemoryReactor
 from twisted.internet.defer import \
-    Deferred, inlineCallbacks, gatherResults, passthru, returnValue, succeed
+    Deferred, inlineCallbacks, gatherResults, passthru, returnValue, succeed, \
+    CancelledError
 from twisted.internet.task import Clock as _Clock
 from twisted.protocols.amp import Command, AMP, Integer
 from twisted.application.service import Service, MultiService
@@ -1116,7 +1117,12 @@
         self.node1.setServiceParent(ms)
         self.node2.setServiceParent(ms)
         ms.startService()
-        self.addCleanup(ms.stopService)
+        @inlineCallbacks
+        def _clean():
+            yield ms.stopService()
+            self.flushLoggedErrors(CancelledError)
+
+        self.addCleanup(_clean)
         yield gatherResults([d1, d2])
         self.store.queuer = self.node1
 

Modified: twext/trunk/twext/enterprise/test/test_queue.py
===================================================================
--- twext/trunk/twext/enterprise/test/test_queue.py	2014-06-03 02:20:23 UTC (rev 13599)
+++ twext/trunk/twext/enterprise/test/test_queue.py	2014-06-03 17:23:37 UTC (rev 13600)
@@ -26,7 +26,7 @@
 from twisted.trial.unittest import TestCase, SkipTest
 from twisted.test.proto_helpers import StringTransport, MemoryReactor
 from twisted.internet.defer import (
-    Deferred, inlineCallbacks, gatherResults, passthru, returnValue
+    Deferred, inlineCallbacks, gatherResults, passthru, returnValue, CancelledError
 )
 from twisted.internet.task import Clock as _Clock
 from twisted.protocols.amp import Command
@@ -817,7 +817,13 @@
         self.node1.setServiceParent(ms)
         self.node2.setServiceParent(ms)
         ms.startService()
-        self.addCleanup(ms.stopService)
+
+        @inlineCallbacks
+        def _clean():
+            yield ms.stopService()
+            self.flushLoggedErrors(CancelledError)
+
+        self.addCleanup(_clean)
         yield gatherResults([d1, d2])
         self.store.queuer = self.node1
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140603/2aa8c337/attachment.html>


More information about the calendarserver-changes mailing list