[Checkins] SVN: z3c.recipe.winservice/trunk/src/z3c/recipe/winservice/ - Updated tests to be more tolerant to different Python versions.

Michael Howitz mh at gocept.com
Tue Sep 28 02:54:23 EDT 2010


Log message for revision 116999:
  - Updated tests to be more tolerant to different Python versions.
  
  - Using Python's doctest module instead of depreacted zope.testing.doctest

Changed:
  U   z3c.recipe.winservice/trunk/src/z3c/recipe/winservice/README.txt
  U   z3c.recipe.winservice/trunk/src/z3c/recipe/winservice/tests.py

-=-
Modified: z3c.recipe.winservice/trunk/src/z3c/recipe/winservice/README.txt
===================================================================
--- z3c.recipe.winservice/trunk/src/z3c/recipe/winservice/README.txt	2010-09-28 06:31:58 UTC (rev 116998)
+++ z3c.recipe.winservice/trunk/src/z3c/recipe/winservice/README.txt	2010-09-28 06:54:23 UTC (rev 116999)
@@ -186,7 +186,7 @@
   import win32process
   <BLANKLINE>
   # these are replacements from winservice recipe
-  PYTHON = r'U:\Python24\python.exe'
+  PYTHON = r'...'
   PYTHONDIR = os.path.split(PYTHON)[0]
   PYTHONSERVICE_EXE = r'%s\Lib\site-packages\win32\pythonservice.exe' % PYTHONDIR
   TOSTART = r'/sample-buildout/bin/app-script.py'

Modified: z3c.recipe.winservice/trunk/src/z3c/recipe/winservice/tests.py
===================================================================
--- z3c.recipe.winservice/trunk/src/z3c/recipe/winservice/tests.py	2010-09-28 06:31:58 UTC (rev 116998)
+++ z3c.recipe.winservice/trunk/src/z3c/recipe/winservice/tests.py	2010-09-28 06:54:23 UTC (rev 116999)
@@ -14,7 +14,7 @@
 
 import re
 import unittest
-from zope.testing import doctest
+import doctest
 from zope.testing import renormalizing
 
 import zc.buildout.testing
@@ -64,7 +64,10 @@
     return unittest.TestSuite(
         doctest.DocFileSuite('README.txt',
             setUp=setUp, tearDown=zc.buildout.testing.buildoutTearDown,
-            optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+            optionflags=(
+                doctest.NORMALIZE_WHITESPACE|
+                doctest.ELLIPSIS|
+                doctest.REPORT_NDIFF),
             checker=checker),
         )
 



More information about the checkins mailing list