[Zope3-dev] Win32 Tests - Zope 3 - failures:2

[zope-tests@squishdot.org]

======================================================================
Python Version:2.2.3 (#42, May 30 2003, 18:12:08) [MSC 32 bit (Intel)]

Modules included:
Zope3 (HEAD)

Running unit tests from D:\ZopeTests\sandbox\Zope3
Failure in test test_merge_conflict (zope.fssync.tests.test_fsmerger.TestFSMerger)
Traceback (most recent call last):
  File "D:\ZopeTests\sandbox\Zope3\src\zope\fssync\tests\test_fsmerger.py", line 279, in test_merge_conflict
    self.make_conflict_entry, self.entry)
  File "D:\ZopeTests\sandbox\Zope3\src\zope\fssync\tests\test_fsmerger.py", line 240, in mergetest
    self.checkfile(localfile, expected_localdata)
  File "D:\ZopeTests\sandbox\Zope3\src\zope\fssync\tests\test_fsmerger.py", line 120, in checkfile
    self.assertEqual(actual_data, expected_data)
  File "C:\PYTHON22\lib\unittest.py", line 286, in failUnlessEqual
    raise self.failureException, \
AssertionError: 'l\n' != '<<<<<<< C:\\DOCUME~1\\CHRISW~1\\LOCALS~1\\Temp\\~2128-476\\local\\foo\nl\n=======\nr\n>>>>>>> C:\\DOCUME~1\\CHRISW~1\\LOCALS~1\\Temp\\~2128-477\\remote\\foo\n'

Failure in test test_merge_diff3 (zope.fssync.tests.test_fsmerger.TestFSMerger)
Traceback (most recent call last):
  File "D:\ZopeTests\sandbox\Zope3\src\zope\fssync\tests\test_fsmerger.py", line 267, in test_merge_diff3
    self.entry, self.entry)
  File "D:\ZopeTests\sandbox\Zope3\src\zope\fssync\tests\test_fsmerger.py", line 234, in mergetest
    self.assertEqual(filtered_reports, expected_reports)
  File "C:\PYTHON22\lib\unittest.py", line 286, in failUnlessEqual
    raise self.failureException, \
AssertionError: ['C C:\\DOCUME~1\\CHRISW~1\\LOCALS~1\\Temp\\~2128-478\\local\\foo'] != ['M C:\\DOCUME~1\\CHRISW~1\\LOCALS~1\\Temp\\~2128-478\\local\\foo']

======================================================================
FAIL: test_merge_conflict (zope.fssync.tests.test_fsmerger.TestFSMerger)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "D:\ZopeTests\sandbox\Zope3\src\zope\fssync\tests\test_fsmerger.py", line 279, in test_merge_conflict
    self.make_conflict_entry, self.entry)
  File "D:\ZopeTests\sandbox\Zope3\src\zope\fssync\tests\test_fsmerger.py", line 240, in mergetest
    self.checkfile(localfile, expected_localdata)
  File "D:\ZopeTests\sandbox\Zope3\src\zope\fssync\tests\test_fsmerger.py", line 120, in checkfile
    self.assertEqual(actual_data, expected_data)
  File "C:\PYTHON22\lib\unittest.py", line 286, in failUnlessEqual
    raise self.failureException, \
AssertionError: 'l\n' != '<<<<<<< C:\\DOCUME~1\\CHRISW~1\\LOCALS~1\\Temp\\~2128-476\\local\\foo\nl\n=======\nr\n>>>>>>> C:\\DOCUME~1\\CHRISW~1\\LOCALS~1\\Temp\\~2128-477\\remote\\foo\n'

======================================================================
FAIL: test_merge_diff3 (zope.fssync.tests.test_fsmerger.TestFSMerger)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "D:\ZopeTests\sandbox\Zope3\src\zope\fssync\tests\test_fsmerger.py", line 267, in test_merge_diff3
    self.entry, self.entry)
  File "D:\ZopeTests\sandbox\Zope3\src\zope\fssync\tests\test_fsmerger.py", line 234, in mergetest
    self.assertEqual(filtered_reports, expected_reports)
  File "C:\PYTHON22\lib\unittest.py", line 286, in failUnlessEqual
    raise self.failureException, \
AssertionError: ['C C:\\DOCUME~1\\CHRISW~1\\LOCALS~1\\Temp\\~2128-478\\local\\foo'] != ['M C:\\DOCUME~1\\CHRISW~1\\LOCALS~1\\Temp\\~2128-478\\local\\foo']

----------------------------------------------------------------------
Ran 4379 tests in 281.813s

FAILED (failures=2)