[Checkins] SVN: zc.async/branches/matt-python-versions/src/zc/async/ Changed ellipsis to match different exception formats in different Pythons.
matt@zope.com
cvs-admin at zope.org
Mon Nov 24 12:16:30 EST 2008
Log message for revision 93322:
Changed ellipsis to match different exception formats in different Pythons.
Changed:
U zc.async/branches/matt-python-versions/src/zc/async/README_1.txt
U zc.async/branches/matt-python-versions/src/zc/async/catastrophes.txt
U zc.async/branches/matt-python-versions/src/zc/async/dispatcher.txt
U zc.async/branches/matt-python-versions/src/zc/async/job.txt
-=-
Modified: zc.async/branches/matt-python-versions/src/zc/async/README_1.txt
===================================================================
--- zc.async/branches/matt-python-versions/src/zc/async/README_1.txt 2008-11-24 17:12:14 UTC (rev 93321)
+++ zc.async/branches/matt-python-versions/src/zc/async/README_1.txt 2008-11-24 17:16:30 UTC (rev 93322)
@@ -304,8 +304,8 @@
>>> transaction.commit()
>>> reactor.wait_for(job)
>>> t = transaction.begin()
- >>> job.result
- <zc.twist.Failure exceptions.NameError>
+ >>> job.result # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
+ <zc.twist.Failure ...exceptions.NameError...
Failures can provide useful information such as tracebacks.
@@ -358,8 +358,8 @@
>>> callback2 = callback1.addCallback(I_scribble_on_strings)
>>> transaction.commit()
>>> reactor.wait_for(job)
- >>> job.result
- <zc.twist.Failure exceptions.NameError>
+ >>> job.result # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
+ <zc.twist.Failure ...exceptions.NameError...
>>> callback1.result
'I handled a name error'
>>> callback2.result
@@ -917,8 +917,8 @@
... datetime.timedelta(hours=1))
>>> transaction.commit()
>>> reactor.wait_for(job)
- >>> job.result
- <zc.twist.Failure zc.async.interfaces.TimeoutError>
+ >>> job.result # doctest: +ELLIPSIS
+ <zc.twist.Failure ...zc.async.interfaces.TimeoutError...
>>> import sys
>>> job.result.printTraceback(sys.stdout) # doctest: +NORMALIZE_WHITESPACE
Traceback (most recent call last):
Modified: zc.async/branches/matt-python-versions/src/zc/async/catastrophes.txt
===================================================================
--- zc.async/branches/matt-python-versions/src/zc/async/catastrophes.txt 2008-11-24 17:12:14 UTC (rev 93321)
+++ zc.async/branches/matt-python-versions/src/zc/async/catastrophes.txt 2008-11-24 17:16:30 UTC (rev 93322)
@@ -462,7 +462,7 @@
>>> transaction.commit()
>>> pprint.pprint(zc.async.testing.get_poll(dispatcher)) # doctest: +ELLIPSIS
{'': {'main': {'active jobs': [],
- 'error': <zc.twist.Failure ...ClientDisconnected>,
+ 'error': <zc.twist.Failure ...ClientDisconnected...,
'len': 0,
'new jobs': [],
'size': 3}}}
Modified: zc.async/branches/matt-python-versions/src/zc/async/dispatcher.txt
===================================================================
--- zc.async/branches/matt-python-versions/src/zc/async/dispatcher.txt 2008-11-24 17:12:14 UTC (rev 93321)
+++ zc.async/branches/matt-python-versions/src/zc/async/dispatcher.txt 2008-11-24 17:16:30 UTC (rev 93322)
@@ -537,8 +537,8 @@
... zc.async.job.Job(operator.mul, 14, None))
>>> transaction.commit()
- >>> wait_for_result(bad_job)
- <zc.twist.Failure exceptions.TypeError>
+ >>> wait_for_result(bad_job) # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
+ <zc.twist.Failure ...TypeError...
>>> for r in reversed(event_logs.records):
... if r.levelname == 'ERROR':
Modified: zc.async/branches/matt-python-versions/src/zc/async/job.txt
===================================================================
--- zc.async/branches/matt-python-versions/src/zc/async/job.txt 2008-11-24 17:12:14 UTC (rev 93321)
+++ zc.async/branches/matt-python-versions/src/zc/async/job.txt 2008-11-24 17:16:30 UTC (rev 93322)
@@ -105,8 +105,8 @@
>>> j = root['j'] = zc.async.job.Job(callFailure)
>>> transaction.commit()
>>> res = j()
- >>> j.result
- <zc.twist.Failure exceptions.RuntimeError>
+ >>> j.result # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
+ <zc.twist.Failure ...RuntimeError...
These are standard twisted Failures, except that frames in the stored
traceback have been converted to reprs, so that we don't keep references
@@ -318,7 +318,7 @@
>>> j.addCallbacks(success, failure) # doctest: +ELLIPSIS
<zc.async.job.SuccessFailureCallbackProxy ...>
>>> res = j() # doctest: +ELLIPSIS
- failure. [Failure instance: Traceback: exceptions.TypeError...]
+ failure. [Failure instance: Traceback: ...TypeError...]
[#errback_log]_ You can also add multiple callbacks.
@@ -345,8 +345,8 @@
>>> j.addCallbacks(failure=also_failure) # doctest: +ELLIPSIS
<zc.async.job.SuccessFailureCallbackProxy ...>
>>> res = j() # doctest: +ELLIPSIS
- failure. [Failure instance: Traceback: exceptions.TypeError...]
- also a failure. [Failure instance: Traceback: exceptions.TypeError...]
+ failure. [Failure instance: Traceback: ...TypeError...]
+ also a failure. [Failure instance: Traceback: ...TypeError...]
------------------
Chaining Callbacks
@@ -877,30 +877,30 @@
...
>>> job = root['j'] = zc.async.job.Job(raiseAnError, ValueError)
>>> transaction.commit()
- >>> job()
- <zc.twist.Failure exceptions.ValueError>
- >>> job.result
- <zc.twist.Failure exceptions.ValueError>
+ >>> job() # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
+ <zc.twist.Failure ...ValueError...
+ >>> job.result # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
+ <zc.twist.Failure ...ValueError...
>>> count
1
>>> count = 0
>>> job = root['j'] = zc.async.job.Job(raiseAnError, TypeError)
>>> transaction.commit()
- >>> job()
- <zc.twist.Failure exceptions.TypeError>
- >>> job.result
- <zc.twist.Failure exceptions.TypeError>
+ >>> job() # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
+ <zc.twist.Failure ...TypeError...
+ >>> job.result # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
+ <zc.twist.Failure ...TypeError...
>>> count
1
>>> count = 0
>>> job = root['j'] = zc.async.job.Job(raiseAnError, RuntimeError)
>>> transaction.commit()
- >>> job()
- <zc.twist.Failure exceptions.RuntimeError>
- >>> job.result
- <zc.twist.Failure exceptions.RuntimeError>
+ >>> job() # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
+ <zc.twist.Failure ...RuntimeError...
+ >>> job.result # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
+ <zc.twist.Failure ...RuntimeError...
>>> count
1
>>> count = 0
@@ -912,10 +912,10 @@
>>> job = root['j'] = zc.async.job.Job(raiseAnError,
... ZODB.POSException.ConflictError)
>>> transaction.commit()
- >>> job()
- <zc.twist.Failure ZODB.POSException.ConflictError>
- >>> job.result
- <zc.twist.Failure ZODB.POSException.ConflictError>
+ >>> job() # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
+ <zc.twist.Failure ...ZODB.POSException.ConflictError...
+ >>> job.result # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
+ <zc.twist.Failure ...ZODB.POSException.ConflictError...
>>> count
5
>>> count = 0
@@ -1086,9 +1086,9 @@
>>> error = ValueError
>>> j = root['j'] = zc.async.job.Job(count_calls)
>>> transaction.commit()
- >>> j()
+ >>> j() # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
tried 2 time(s). committing.
- <zc.twist.Failure exceptions.ValueError>
+ <zc.twist.Failure ...exceptions.ValueError...
>>> count
1
@@ -1110,9 +1110,9 @@
>>> allow_commits = [1, 2, 3] # set to active, then get retry policy, then call
>>> j = root['j'] = zc.async.job.Job(raiseAnError, RuntimeError)
>>> transaction.commit()
- >>> j()
+ >>> j() # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
tried 2 time(s). committing.
- <zc.twist.Failure exceptions.ValueError>
+ <zc.twist.Failure ...exceptions.ValueError...
>>> found = []
>>> for r in reversed(event_logs.records):
... if r.levelname == 'ERROR':
@@ -1142,9 +1142,9 @@
>>> error = ZODB.POSException.ConflictError
>>> j = root['j'] = zc.async.job.Job(count_calls)
>>> transaction.commit()
- >>> j()
+ >>> j() # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
tried 6 time(s). committing.
- <zc.twist.Failure ZODB.POSException.ConflictError>
+ <zc.twist.Failure ...ZODB.POSException.ConflictError...
>>> count
5
@@ -1255,9 +1255,9 @@
>>> allow_commits = [1, 3, 4, 6, 7, 9, 10, 12, 13]
>>> j = root['j'] = zc.async.job.Job(count_calls)
>>> transaction.commit()
- >>> j()
+ >>> j() # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
tried 50 time(s). committing.
- <zc.twist.Failure ZODB.POSException.ConflictError>
+ <zc.twist.Failure ...ZODB.POSException.ConflictError...
>>> count
5
@@ -1306,8 +1306,8 @@
>>> j.handleInterrupt()
>>> j.status == zc.async.interfaces.COMPLETED
True
- >>> j.result
- <zc.twist.Failure zc.async.interfaces.AbortedError>
+ >>> j.result # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
+ <zc.twist.Failure ...zc.async.interfaces.AbortedError...
If the retry policy returns True, as happens above, this should be interpreted
by the agent and queue as a request to immediately reschedule the job. The
@@ -1771,8 +1771,8 @@
>>> res = j()
>>> root['demo'].counter # it was not rolled back automatically
2
- >>> j.result
- <zc.twist.Failure exceptions.RuntimeError>
+ >>> j.result # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
+ <zc.twist.Failure ...RuntimeError...
>>> print j.result.getTraceback() # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
Traceback (most recent call last):
...
@@ -2064,6 +2064,6 @@
... zc.async.job.Job(call, j)).addCallbacks(failure=failure)
>>> transaction.commit()
>>> res = j() # doctest: +ELLIPSIS
- failure. [Failure instance: Traceback: zc.async.interfaces.BadStatusError...]
+ failure. [Failure instance: Traceback: ...zc.async.interfaces.BadStatusError...]
>>> j.result # the main job still ran to completion
12
More information about the Checkins
mailing list