[Zope3-checkins] SVN: Zope3/branches/Zope-3.1/src/zope/fssync/tests/test_fsmerger.py Fix test failure on Windows when a diff3 executable exists.

[Benji York]

Log message for revision 41099:
  Fix test failure on Windows when a diff3 executable exists.

Changed:
  U   Zope3/branches/Zope-3.1/src/zope/fssync/tests/test_fsmerger.py

-=-
Modified: Zope3/branches/Zope-3.1/src/zope/fssync/tests/test_fsmerger.py
===================================================================
--- Zope3/branches/Zope-3.1/src/zope/fssync/tests/test_fsmerger.py	2006-01-03 17:31:48 UTC (rev 41098)
+++ Zope3/branches/Zope-3.1/src/zope/fssync/tests/test_fsmerger.py	2006-01-03 17:36:12 UTC (rev 41099)
@@ -44,6 +44,11 @@
         return self.diff3ok
 
     def diff3_check(self):
+        if sys.platform == 'win32':
+            sys.stderr.write(
+                "\nrunning on Windows, diff3 tests in %s disabled\n"
+                % __name__)
+            return False
         if not hasattr(os, "popen"):
             sys.stderr.write("\nos.popen() not found, diff3 tests disabled\n")
             return False