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

[Guido van Rossum]

> ======================================================================
> 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)

This doesn't fail for me.  My best guess is that it fails because it
relies on the "merge" program.  I'll disable the test until I have
figured out a better way to do a three-way merge (I'd rather not code
one in Python given that merge and diff3 exist).

--Guido van Rossum (home page: http://www.python.org/~guido/)