[Checkins] SVN: zc.monitorpdb/trunk/src/zc/monitorpdb/ remove unneeded method and make tests more robust to line number changes
Benji York
benji at zope.com
Thu Oct 29 17:16:07 EDT 2009
Log message for revision 105378:
remove unneeded method and make tests more robust to line number changes
Changed:
U zc.monitorpdb/trunk/src/zc/monitorpdb/__init__.py
U zc.monitorpdb/trunk/src/zc/monitorpdb/tests.py
-=-
Modified: zc.monitorpdb/trunk/src/zc/monitorpdb/__init__.py
===================================================================
--- zc.monitorpdb/trunk/src/zc/monitorpdb/__init__.py 2009-10-29 21:07:20 UTC (rev 105377)
+++ zc.monitorpdb/trunk/src/zc/monitorpdb/__init__.py 2009-10-29 21:16:07 UTC (rev 105378)
@@ -20,9 +20,6 @@
def __init__(self, connection):
self.connection = connection
- def flush(self):
- pass
-
def write(self, *args):
return self.connection.write(*args)
Modified: zc.monitorpdb/trunk/src/zc/monitorpdb/tests.py
===================================================================
--- zc.monitorpdb/trunk/src/zc/monitorpdb/tests.py 2009-10-29 21:07:20 UTC (rev 105377)
+++ zc.monitorpdb/trunk/src/zc/monitorpdb/tests.py 2009-10-29 21:16:07 UTC (rev 105378)
@@ -11,32 +11,19 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-import datetime
-import unittest
-from zope.testing import doctest, setupstack
-def setUp(test):
+from zope.testing import doctest
+import re
+import zope.testing.renormalizing
- class FauxDateTime:
+checker = zope.testing.renormalizing.RENormalizing([
+ (re.compile(r'^\s*\d+', re.MULTILINE), r'NN'),
+ (re.compile(r'.py\(\d+\)', re.MULTILINE), r'.py(NN)'),
+ ])
- now = datetime.datetime(2008, 9, 5, 21, 10, 13)
- @classmethod
- def utcnow(self):
- self.now += datetime.timedelta(seconds=1)
- return self.now
-
- datetime_orig = datetime.datetime
- def restore():
- datetime.datetime = datetime_orig
-
- setupstack.register(test, restore)
-
- datetime.datetime = FauxDateTime
-
def test_suite():
return doctest.DocFileSuite(
'README.txt',
- setUp=setUp,
- tearDown=setupstack.tearDown,
+ checker=checker,
optionflags=doctest.NORMALIZE_WHITESPACE)
More information about the checkins
mailing list