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

Guido van Rossum guido@python.org
Tue, 13 May 2003 10:10:06 -0400


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

Modified Files:
	test_merger.py 
Log Message:
Use diff3 -m -E instead of merge.
GNU diff3 seems more common; merge is only part of RCS.

=== Zope3/src/zope/fssync/tests/test_merger.py 1.4 => 1.5 ===
--- Zope3/src/zope/fssync/tests/test_merger.py:1.4	Tue May 13 09:47:04 2003
+++ Zope3/src/zope/fssync/tests/test_merger.py	Tue May 13 10:10:06 2003
@@ -108,7 +108,7 @@
             md.setmetadata(local, localmetadata)
         if remotemetadata is not None:
             md.setmetadata(remote, remotemetadata)
-        m = Merger(md, verbose=False)
+        m = Merger(md)
         action, state = m.classify_files(local, orig, remote)
         self.assertEqual((action, state), (exp_action, exp_state))
         # Now try the actual merge
@@ -169,7 +169,7 @@
     def test_remote_modified(self):
         self.runtest("a", "a", "ab", {}, {}, "Copy", "Uptodate")
 
-    def disabled_test_both_modified_resolved(self):
+    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