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

[Guido van Rossum]

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

Modified Files:
	test_merger.py 
Log Message:
Disable a test that depends on the existence of the merge program --
not all Unix installations have it.


=== Zope3/src/zope/fssync/tests/test_merger.py 1.3 => 1.4 ===
--- Zope3/src/zope/fssync/tests/test_merger.py:1.3	Mon May 12 17:04:43 2003
+++ Zope3/src/zope/fssync/tests/test_merger.py	Tue May 13 09:47:04 2003
@@ -169,7 +169,7 @@
     def test_remote_modified(self):
         self.runtest("a", "a", "ab", {}, {}, "Copy", "Uptodate")
 
-    def test_both_modified_resolved(self):
+    def disabled_test_both_modified_resolved(self):
         if os.name != "posix":
             # Alas, this test requires the external command 'merge'
             # which isn't usually found on Windows