Rev 4607: Fix test_foreign for 2a as default. in http://bazaar.launchpad.net/~lifeless/bzr/test-foreign

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/test-foreign

------------------------------------------------------------
revno: 4607
revision-id: robertc at robertcollins.net-20090814043032-008xgmj4axr8yi23
parent: pqm at pqm.ubuntu.com-20090814002017-l0qxa8jj76sige97
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-foreign
timestamp: Fri 2009-08-14 14:30:32 +1000
message:
  Fix test_foreign for 2a as default.
=== modified file 'bzrlib/tests/test_foreign.py'
--- a/bzrlib/tests/test_foreign.py	2009-06-10 03:56:49 +0000
+++ b/bzrlib/tests/test_foreign.py	2009-08-14 04:30:32 +0000
@@ -309,6 +309,7 @@
         self.build_tree_contents([('br1/bla', 'original contents\n')])
         wt.add('bla', 'bla-a')
         wt.commit('bla-a')
+        root_id = wt.get_root_id()
         target = wt.bzrdir.sprout('br2').open_workingtree()
         target.unversion(['bla-a'])
         target.add('bla', 'bla-b')
@@ -319,7 +320,7 @@
         foreign.update_workingtree_fileids(wt, target_basis)
         wt.lock_read()
         try:
-            self.assertEquals(["TREE_ROOT", "bla-b"], list(wt.inventory))
+            self.assertEquals([root_id, "bla-b"], list(wt.inventory))
         finally:
             wt.unlock()