[Zope3-dev] test failure on HEAD: zope.fssync

[Steve Alexander]

$ python test.py zope.fssync.tests test_both_modified_resolved
Running unit tests from /home/steve/coding/zope3/Zope3
Failure in test test_both_modified_resolved 
(zope.fssync.tests.test_merger.TestMerger)
Traceback (most recent call last):
   File "Zope3/src/zope/fssync/tests/test_merger.py", line 177, in 
test_both_modified_resolved
     self.runtest("l\na\n", "a\n", "a\nr\n", {}, {}, "Merge", "Modified")
   File "Zope3/src/zope/fssync/tests/test_merger.py", line 116, in runtest
     self.assertEqual(state, exp_merge_state or exp_state)
   File "/usr/lib/python2.2/unittest.py", line 286, in failUnlessEqual
     raise self.failureException, \
AssertionError: 'Conflict' != 'Modified'

======================================================================
FAIL: test_both_modified_resolved (zope.fssync.tests.test_merger.TestMerger)
----------------------------------------------------------------------
Traceback (most recent call last):
   File "Zope3/src/zope/fssync/tests/test_merger.py", line 177, in 
test_both_modified_resolved
     self.runtest("l\na\n", "a\n", "a\nr\n", {}, {}, "Merge", "Modified")
   File "Zope3/src/zope/fssync/tests/test_merger.py", line 116, in runtest
     self.assertEqual(state, exp_merge_state or exp_state)
   File "/usr/lib/python2.2/unittest.py", line 286, in failUnlessEqual
     raise self.failureException, \
AssertionError: 'Conflict' != 'Modified'

----------------------------------------------------------------------
Ran 1 tests in 0.019s

FAILED (failures=1)


--
Steve Alexander