[Zope3-checkins] SVN: Zope3/trunk/src/zope/fssync/tests/test_
explicitly disable some fsmerge tests when running on Windows
(fixes spurious
Benji York
benji at zope.com
Tue Sep 6 10:24:18 EDT 2005
Log message for revision 38304:
explicitly disable some fsmerge tests when running on Windows (fixes spurious
test failures seen when a diff3 executable happens to be installed)
Changed:
U Zope3/trunk/src/zope/fssync/tests/test_fsmerger.py
U Zope3/trunk/src/zope/fssync/tests/test_merger.py
-=-
Modified: Zope3/trunk/src/zope/fssync/tests/test_fsmerger.py
===================================================================
--- Zope3/trunk/src/zope/fssync/tests/test_fsmerger.py 2005-09-06 11:54:56 UTC (rev 38303)
+++ Zope3/trunk/src/zope/fssync/tests/test_fsmerger.py 2005-09-06 14:24:18 UTC (rev 38304)
@@ -44,6 +44,9 @@
return self.diff3ok
def diff3_check(self):
+ if sys.platform == 'win32':
+ sys.stderr.write("\nrunning on Windows, tests disabled\n")
+ return False
if not hasattr(os, "popen"):
sys.stderr.write("\nos.popen() not found, diff3 tests disabled\n")
return False
Modified: Zope3/trunk/src/zope/fssync/tests/test_merger.py
===================================================================
--- Zope3/trunk/src/zope/fssync/tests/test_merger.py 2005-09-06 11:54:56 UTC (rev 38303)
+++ Zope3/trunk/src/zope/fssync/tests/test_merger.py 2005-09-06 14:24:18 UTC (rev 38304)
@@ -16,7 +16,7 @@
$Id$
"""
-import os
+import os, sys
import unittest
from os.path import exists
@@ -39,6 +39,8 @@
return self.diff3ok
def diff3_check(self):
+ if sys.platform == 'win32':
+ return False
if not hasattr(os, "popen"):
return False
f1 = self.tempfile("a")
More information about the Zope3-Checkins
mailing list