[Checkins] SVN: zc.zodbdgc/branches/dev/src/zc/zodbdgc/ Updated to pass tests across python revisions (and hopefully for 64-bit
Jim Fulton
jim at zope.com
Thu Jun 11 15:35:53 EDT 2009
Log message for revision 100884:
Updated to pass tests across python revisions (and hopefully for 64-bit
machines as well).
Changed:
U zc.zodbdgc/branches/dev/src/zc/zodbdgc/oidset.test
U zc.zodbdgc/branches/dev/src/zc/zodbdgc/tests.py
-=-
Modified: zc.zodbdgc/branches/dev/src/zc/zodbdgc/oidset.test
===================================================================
--- zc.zodbdgc/branches/dev/src/zc/zodbdgc/oidset.test 2009-06-11 18:02:20 UTC (rev 100883)
+++ zc.zodbdgc/branches/dev/src/zc/zodbdgc/oidset.test 2009-06-11 19:35:53 UTC (rev 100884)
@@ -92,7 +92,7 @@
>>> import pprint
>>> pprint.pprint(
- ... sorted((name, u64(oid)) for (name, oid) in oids.iterator()),
+ ... sorted((name, long(u64(oid))) for (name, oid) in oids.iterator()),
... width=1)
[('foo',
0L),
@@ -110,7 +110,7 @@
34359738368L)]
>>> pprint.pprint(
- ... sorted(u64(oid) for oid in oids.iterator('foo')),
+ ... sorted(long(u64(oid)) for oid in oids.iterator('foo')),
... width=1)
[0L,
2147483647L,
@@ -128,7 +128,7 @@
True
>>> pprint.pprint(
- ... sorted((name, u64(oid)) for (name, oid) in oids.iterator()),
+ ... sorted((name, long(u64(oid))) for (name, oid) in oids.iterator()),
... width=1)
[('bar',
0L),
@@ -164,7 +164,7 @@
>>> oids.remove('foo', p64((1<<31)-1))
>>> pprint.pprint(
- ... sorted(u64(oid) for oid in oids.iterator('foo')),
+ ... sorted(long(u64(oid)) for oid in oids.iterator('foo')),
... width=1)
[0L,
4294967296L,
Modified: zc.zodbdgc/branches/dev/src/zc/zodbdgc/tests.py
===================================================================
--- zc.zodbdgc/branches/dev/src/zc/zodbdgc/tests.py 2009-06-11 18:02:20 UTC (rev 100883)
+++ zc.zodbdgc/branches/dev/src/zc/zodbdgc/tests.py 2009-06-11 19:35:53 UTC (rev 100884)
@@ -15,14 +15,19 @@
$Id$
"""
+from zope.testing import doctest, setupstack, renormalizing
+import re
import unittest
-from zope.testing import doctest, setupstack
def test_suite():
return unittest.TestSuite((
doctest.DocFileSuite(
'README.test', 'oidset.test',
setUp=setupstack.setUpDirectory, tearDown = setupstack.tearDown,
+ checker=renormalizing.RENormalizing([
+ (re.compile('usage'), 'Usage'),
+ (re.compile('options'), 'Options'),
+ ]),
),
))
More information about the Checkins
mailing list