[CalendarServer-changes] [13303] twext/trunk/twext/enterprise
source_changes at macosforge.org
source_changes at macosforge.org
Wed Apr 16 13:47:22 PDT 2014
Revision: 13303
http://trac.calendarserver.org//changeset/13303
Author: cdaboo at apple.com
Date: 2014-04-16 13:47:22 -0700 (Wed, 16 Apr 2014)
Log Message:
-----------
Fix tests broken by label changes.
Modified Paths:
--------------
twext/trunk/twext/enterprise/jobqueue.py
twext/trunk/twext/enterprise/test/test_jobqueue.py
Modified: twext/trunk/twext/enterprise/jobqueue.py
===================================================================
--- twext/trunk/twext/enterprise/jobqueue.py 2014-04-16 19:54:24 UTC (rev 13302)
+++ twext/trunk/twext/enterprise/jobqueue.py 2014-04-16 20:47:22 UTC (rev 13303)
@@ -945,7 +945,8 @@
def runJob(txn):
try:
job = yield JobItem.load(txn, jobID)
- txn._label = "{} <{}>".format(txn._label, job.workType)
+ if hasattr(txn, "_label"):
+ txn._label = "{} <{}>".format(txn._label, job.workType)
yield job.run()
except NoSuchRecord:
# The record has already been removed
Modified: twext/trunk/twext/enterprise/test/test_jobqueue.py
===================================================================
--- twext/trunk/twext/enterprise/test/test_jobqueue.py 2014-04-16 19:54:24 UTC (rev 13302)
+++ twext/trunk/twext/enterprise/test/test_jobqueue.py 2014-04-16 20:47:22 UTC (rev 13303)
@@ -126,7 +126,7 @@
createdTxns = []
- def createTxn():
+ def createTxn(label):
createdTxns.append(faketxn())
return createdTxns[-1]
@@ -880,15 +880,17 @@
return txn.execSQL(schemaText)
yield inTransaction(
- lambda: self.store.newTransaction("bonus schema"), doit
+ self.store.newTransaction,
+ doit,
+ label="bonus schema"
)
- def indirectedTransactionFactory(*a):
+ def indirectedTransactionFactory(*a, **b):
"""
Allow tests to replace "self.store.newTransaction" to provide
fixtures with extra methods on a test-by-test basis.
"""
- return self.store.newTransaction(*a)
+ return self.store.newTransaction(*a, **b)
def deschema():
@inlineCallbacks
@@ -896,7 +898,7 @@
for stmt in dropSQL:
yield txn.execSQL(stmt)
return inTransaction(
- lambda *a: self.store.newTransaction(*a), deletestuff
+ lambda *a, **b: self.store.newTransaction(*a, **b), deletestuff
)
self.addCleanup(deschema)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140416/03202e97/attachment.html>
More information about the calendarserver-changes
mailing list