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

[Guido van Rossum]

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

Modified Files:
	test_fsmerger.py 
Log Message:
test_new_diretory() works just fine if we change '/' into os.sep
in the report template.


=== Zope3/src/zope/fssync/tests/test_fsmerger.py 1.6 => 1.7 ===
--- Zope3/src/zope/fssync/tests/test_fsmerger.py:1.6	Wed May 28 11:02:25 2003
+++ Zope3/src/zope/fssync/tests/test_fsmerger.py	Wed May 28 11:28:25 2003
@@ -224,6 +224,7 @@
         for er in expected_reports_template:
             er = er.replace("%l", localfile)
             er = er.replace("%r", remotefile)
+            er = er.replace("/", os.sep)
             expected_reports.append(er)
         filtered_reports = [r for r in reports if r[0] not in "*/"]
         self.assertEqual(filtered_reports, expected_reports)
@@ -279,9 +280,8 @@
         return e
 
     def test_new_directory(self):
-        if not self.check_for_diff3():
-            return
-        self.mergetest("foo", None, None, {"x": "x"}, None, self.entry,
+        self.mergetest("foo", None, None, {"x": "x"},
+                       None, self.entry,
                        ["N %l/", "U %l/x"],
                        {"x": "x"}, {"x": "x"}, {"x": "x"},
                        self.entry, self.entry)