[Zope3-checkins] CVS: Zope3/src/zope/fssync/tests - test_merger.py:1.3

[Guido van Rossum]

Update of /cvs-repository/Zope3/src/zope/fssync/tests
In directory cvs.zope.org:/tmp/cvs-serv7160

Modified Files:
	test_merger.py 
Log Message:
Skip test_both_modified_resolved on non-posix platforms, which aren't
likely to have the merge command.


=== Zope3/src/zope/fssync/tests/test_merger.py 1.2 => 1.3 ===
--- Zope3/src/zope/fssync/tests/test_merger.py:1.2	Mon May 12 16:41:23 2003
+++ Zope3/src/zope/fssync/tests/test_merger.py	Mon May 12 17:04:43 2003
@@ -170,6 +170,10 @@
         self.runtest("a", "a", "ab", {}, {}, "Copy", "Uptodate")
 
     def test_both_modified_resolved(self):
+        if os.name != "posix":
+            # Alas, this test requires the external command 'merge'
+            # which isn't usually found on Windows
+            return
         self.runtest("l\na\n", "a\n", "a\nr\n", {}, {}, "Merge", "Modified")
 
     def test_both_modified_conflict(self):