Rev 3952: More cleanup and fix overzealous previous one. in lp:~bzr/bzr/1.12-lca-deleted

[Vincent Ladeuil]

At lp:~bzr/bzr/1.12-lca-deleted

------------------------------------------------------------
revno: 3952
revision-id: v.ladeuil+lp at free.fr-20090123095303-gvzd86p6p2ytmhxz
parent: v.ladeuil+lp at free.fr-20090122133817-cerv5t33wgw2m5qj
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: spurious-conflicts
timestamp: Fri 2009-01-23 10:53:03 +0100
message:
  More cleanup and fix overzealous previous one.
  
  * bzrlib/tests/test_merge.py:
  (TestMergerEntriesLCA.test_file_not_in_one_lca,
  TestMergerEntriesLCA.test_only_in_one_lca,
  TestMergerEntriesLCA.test_same_lca_resolution_one_side_updates_content,
  TestMergerEntriesLCA.test_this_changed_kind): Delete useless vars.
  (TestMergerEntriesLCA.test_not_in_other_mod_in_lca1_not_in_lca2):
  But not there !.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_merge.py'
--- a/bzrlib/tests/test_merge.py	2009-01-22 13:38:17 +0000
+++ b/bzrlib/tests/test_merge.py	2009-01-23 09:53:03 +0000
@@ -1381,7 +1381,6 @@
         self.assertEqual('A-id', merge_obj.base_tree.get_revision_id())
 
         entries = list(merge_obj._entries_lca())
-        root_id = 'a-root-id'
         self.assertEqual([], entries)
 
     def test_not_in_other(self):
@@ -1458,6 +1457,7 @@
         merge_obj = self.make_merge_obj(builder, 'E-id')
 
         entries = list(merge_obj._entries_lca())
+        root_id = 'a-root-id'
         self.assertEqual([('foo-id', True,
                            ((root_id, [root_id, None]), None, root_id),
                            ((u'foo', [u'foo', None]), None, 'foo'),
@@ -1492,7 +1492,6 @@
         merge_obj = self.make_merge_obj(builder, 'E-id')
 
         entries = list(merge_obj._entries_lca())
-        root_id = 'a-root-id'
         self.assertEqual([], entries)
 
     def test_only_in_other(self):
@@ -1723,7 +1722,6 @@
         merge_obj = self.make_merge_obj(builder, 'E-id')
 
         entries = list(merge_obj._entries_lca())
-        root_id = 'a-root-id'
         self.expectFailure("We don't detect that LCA resolution was the"
                            " same on both sides",
             self.assertEqual, [], entries)
@@ -1784,7 +1782,6 @@
              ('add', (u'a', 'a-id', 'directory', None))])
         merge_obj = self.make_merge_obj(builder, 'E-id')
         entries = list(merge_obj._entries_lca())
-        root_id = 'a-root-id'
         # Only the kind was changed (content)
         self.assertEqual([], entries)