[Zope3-checkins] CVS: Zope3/src/zope/fssync/tests - test_fsmerger.py:1.11

[Fred L. Drake, Jr.]

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

Modified Files:
	test_fsmerger.py 
Log Message:
Convert to use Subversion's explicit model of conflict resolution instead of the
implicit (mtime-based) model used by CVS.


=== Zope3/src/zope/fssync/tests/test_fsmerger.py 1.10 => 1.11 ===
--- Zope3/src/zope/fssync/tests/test_fsmerger.py:1.10	Tue Jun  3 14:24:35 2003
+++ Zope3/src/zope/fssync/tests/test_fsmerger.py	Mon Aug 11 18:02:16 2003
@@ -280,7 +280,7 @@
 
     def make_conflict_entry(self, local):
         # Helper for test_*_conflict
-        e = {"conflict": os.path.getmtime(local)}
+        e = {"conflict": "yes"}
         e.update(self.entry)
         return e
 
@@ -293,21 +293,12 @@
                        ["C %l"], conflict, "r\n", "r\n",
                        self.make_conflict_entry, self.entry)
 
-    def test_unstuck_conflict(self):
-        conflict_entry = {"conflict": 12345}
-        conflict_entry.update(self.entry)
-        self.mergetest("foo", "resolved\n", "r\n", "r\n",
-                       conflict_entry, self.entry,
-                       ["M %l"], "resolved\n", "r\n", "r\n",
-                       self.entry, self.entry)
-
-    def test_cleared_conflict(self):
-        conflict_entry = {"conflict": 12345}
-        conflict_entry.update(self.entry)
+    def test_cleared_but_unresolved_conflict(self):
+        # data are the same, but the conflict marker hasn't been cleared
         self.mergetest("foo", "r\n", "r\n", "r\n",
-                       conflict_entry, self.entry,
-                       [], "r\n", "r\n", "r\n",
-                       self.entry, self.entry)
+                       self.make_conflict_entry, self.entry,
+                       ["C %l"], "r\n", "r\n", "r\n",
+                       self.make_conflict_entry, self.entry)
 
     # Tests for added files: local, remote, both