Rev 458: Fix another test. in file:///data/jelmer/bzr-svn/nestedtrees/

Jelmer Vernooij jelmer at samba.org
Tue Jul 8 02:57:49 BST 2008


At file:///data/jelmer/bzr-svn/nestedtrees/

------------------------------------------------------------
revno: 458
revision-id: jelmer at samba.org-20080708015748-l572h74tazsw9izi
parent: jelmer at samba.org-20080708013122-0xb0kkjpg5jvct8k
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: nestedtrees
timestamp: Tue 2008-07-08 03:57:48 +0200
message:
  Fix another test.
modified:
  tests/test_tree.py             test_tree.py-20070103204350-pr8nupes7e5sd2wr-1
=== modified file 'tests/test_tree.py'
--- a/tests/test_tree.py	2008-07-08 01:31:22 +0000
+++ b/tests/test_tree.py	2008-07-08 01:57:48 +0000
@@ -74,6 +74,7 @@
 
     def test_external(self):
         ref_repos_url = self.make_client("ref", "de")
+        ref_repos = Repository.open(ref_repos_url)
         self.make_client("d", "dc")
         self.client_set_prop("dc", "svn:externals", str("bla\t%s\n" % ref_repos_url))
         self.client_commit("dc", "add external")
@@ -82,10 +83,10 @@
         tree = SvnBasisTree(wt)
         self.assertEqual('tree-reference', 
                          tree.inventory[tree.inventory.path2id("bla")].kind)
-        mapping = wt.branch.repository.get_mapping()
-        self.assertEqual(TreeReference(mapping.generate_file_id(wt.branch.repository.uuid, 0, "", u""),
-             'bla', wt.branch.get_root_id(), revision=wt.branch.generate_revision_id(1)),
-                         tree.inventory[tree.inventory.path2id("bla")])
+        mapping = ref_repos.get_mapping()
+        treeref = TreeReference(mapping.generate_file_id(ref_repos.uuid, 0, "", u""),
+             'bla', wt.branch.get_root_id(), revision=wt.branch.generate_revision_id(1))
+        self.assertEqual(tree.inventory[tree.inventory.path2id("bla")], treeref)
 
     def test_symlink_next(self):
         repos_url = self.make_client("d", "dc")




More information about the bazaar-commits mailing list