Rev 4617: (robertc) Prepare test_foreign for rich roots as the default format. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4617 [merge]
revision-id: pqm at pqm.ubuntu.com-20090817003227-g813yyjlq47j9qyb
parent: pqm at pqm.ubuntu.com-20090816231652-3v3cyyio0ibr7odn
parent: robertc at robertcollins.net-20090814043032-008xgmj4axr8yi23
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-08-17 01:32:27 +0100
message:
  (robertc) Prepare test_foreign for rich roots as the default format.
  	(Robert Collins)
modified:
  bzrlib/tests/test_foreign.py   test_foreign.py-20081125004048-ywb901edgp9lluxo-1
=== 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()