Rev 4634: More precise test. in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4634
revision-id: v.ladeuil+lp at free.fr-20100310150458-aziouc6c69gkjakz
parent: v.ladeuil+lp at free.fr-20100310142411-cvtfb64srgkp62ly
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: more-tests
timestamp: Wed 2010-03-10 16:04:58 +0100
message:
  More precise test.
  
  * bzrlib/tests/test_conflicts.py:
  (TestResolveDuplicateEntry.assertDuplicateEntry): Also check
  conflict_path.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_conflicts.py'
--- a/bzrlib/tests/test_conflicts.py	2010-03-10 14:24:11 +0000
+++ b/bzrlib/tests/test_conflicts.py	2010-03-10 15:04:58 +0000
@@ -498,13 +498,14 @@
                                     check='file_content_a')),
              ('fileb_created', dict(actions='create_file_b',
                                    check='file_content_b')),
-             dict(_actions_base='nothing', _item_path='file.moved')),
+             dict(_actions_base='nothing', _item_path='file')),
             ]
         return klass.mirror_scenarios(base_scenarios)
 
     def assertDuplicateEntry(self, wt, c):
         self.assertEqual(self._this_id, c.file_id)
-        self.assertEqual(self._item_path, c.path)
+        self.assertEqual(self._item_path + '.moved', c.path)
+        self.assertEqual(self._item_path, c.conflict_path)
     _assert_conflict = assertDuplicateEntry