[Checkins] SVN: zc.zope3recipes/trunk/zc/zope3recipes/tests.py Merge from 0.6 branch: added ellipsis

Christophe Combelles ccomb at free.fr
Wed Aug 13 19:41:15 EDT 2008


Log message for revision 89817:
  Merge from 0.6 branch: added ellipsis
  

Changed:
  U   zc.zope3recipes/trunk/zc/zope3recipes/tests.py

-=-
Modified: zc.zope3recipes/trunk/zc/zope3recipes/tests.py
===================================================================
--- zc.zope3recipes/trunk/zc/zope3recipes/tests.py	2008-08-13 23:08:01 UTC (rev 89816)
+++ zc.zope3recipes/trunk/zc/zope3recipes/tests.py	2008-08-13 23:41:14 UTC (rev 89817)
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 
-import re, sys
+import re, sys, os
 
 import zc.buildout.testing
 
@@ -40,7 +40,7 @@
     ... ''')
 
     >>> print system(join('bin', 'buildout')),
-    Installing ctl.
+    Installing ctl...
     Generated script '/sample-buildout/bin/ctl'.
 
 We'll create a configuration file:
@@ -232,15 +232,21 @@
     suite = unittest.TestSuite()
     if sys.platform[:3].lower() == "win":
         suite.addTest(doctest.DocFileSuite('WINDOWS.txt',
-            setUp=setUp, tearDown=zc.buildout.testing.buildoutTearDown,
-            checker=checker))
+                 setUp=setUp,
+                 tearDown=zc.buildout.testing.buildoutTearDown,
+                 checker=checker,
+                 optionflags = doctest.NORMALIZE_WHITESPACE+doctest.ELLIPSIS))
     else:
         suite.addTest(doctest.DocTestSuite(
-            setUp=setUp, tearDown=zc.buildout.testing.buildoutTearDown,
-            checker=checker))
+            setUp=setUp,
+            tearDown=zc.buildout.testing.buildoutTearDown,
+            checker=checker,
+            optionflags = doctest.NORMALIZE_WHITESPACE+doctest.ELLIPSIS))
         suite.addTest(doctest.DocFileSuite('README.txt',
-            setUp=setUp, tearDown=zc.buildout.testing.buildoutTearDown,
-            checker=checker))
+            setUp=setUp,
+            tearDown=zc.buildout.testing.buildoutTearDown,
+            checker=checker,
+            optionflags = doctest.NORMALIZE_WHITESPACE+doctest.ELLIPSIS))
 
     return suite
 



More information about the Checkins mailing list