Rev 1697: Fix more tests. in file:///data/jelmer/bzr-svn/trunk/
Jelmer Vernooij
jelmer at samba.org
Fri Aug 29 17:19:36 BST 2008
At file:///data/jelmer/bzr-svn/trunk/
------------------------------------------------------------
revno: 1697
revision-id: jelmer at samba.org-20080829161934-0ptfyd9up2aakw73
parent: jelmer at samba.org-20080829160332-n40golaczzz3wkxp
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-08-29 18:19:34 +0200
message:
Fix more tests.
modified:
log.py log.py-20080707143400-mxzjdllay5jhvnq1-1
tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
tests/test_repository.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_tree.py test_tree.py-20070103204350-pr8nupes7e5sd2wr-1
tests/test_workingtree.py test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
=== modified file 'log.py'
--- a/log.py 2008-08-29 16:00:52 +0000
+++ b/log.py 2008-08-29 16:19:34 +0000
@@ -24,7 +24,7 @@
data = (rev.svn_meta.revnum, rev.svn_meta.branch_path)
else:
try:
- (uuid, bp, revnum, mapp) = mapping.revision_id_bzr_to_foreign(rev.revision_id)
+ (uuid, bp, revnum, mapp) = mapping.parse_revision_id(rev.revision_id)
except InvalidRevisionId:
pass
else:
=== modified file 'tests/test_blackbox.py'
--- a/tests/test_blackbox.py 2008-08-29 15:39:07 +0000
+++ b/tests/test_blackbox.py 2008-08-29 16:19:34 +0000
@@ -276,13 +276,13 @@
newrepos = Repository.open("dc")
mapping = BzrSvnMappingv3FileProps(NoBranchingScheme())
self.assertTrue(newrepos.has_revision(
- mapping.generate_revision_id((uuid, 5, ""))))
+ mapping.revision_id_foreign_to_bzr((uuid, 5, ""))))
self.assertTrue(newrepos.has_revision(
- mapping.generate_revision_id((uuid, 1, ""))))
+ mapping.revision_id_foreign_to_bzr((uuid, 1, ""))))
inv1 = newrepos.get_inventory(
- mapping.generate_revision_id((uuid, 1, "")))
+ mapping.revision_id_foreign_to_bzr((uuid, 1, "")))
inv2 = newrepos.get_inventory(
- mapping.generate_revision_id((uuid, 5, "")))
+ mapping.revision_id_foreign_to_bzr((uuid, 5, "")))
self.assertNotEqual(inv1.path2id("y"), inv2.path2id("y"))
=== modified file 'tests/test_repository.py'
--- a/tests/test_repository.py 2008-08-29 15:39:07 +0000
+++ b/tests/test_repository.py 2008-08-29 16:19:34 +0000
@@ -121,7 +121,7 @@
repos_url = self.make_repository("a")
repos = Repository.open(repos_url)
mapping = repos.get_mapping()
- self.assertEqual({u"": (mapping.generate_file_id(repos.uuid, 0, "", u""), mapping.generate_revision_id((repos.uuid, 0, "")))}, repos.get_fileid_map(0, "", mapping))
+ self.assertEqual({u"": (mapping.generate_file_id(repos.uuid, 0, "", u""), mapping.revision_id_foreign_to_bzr((repos.uuid, 0, "")))}, repos.get_fileid_map(0, "", mapping))
def test_generate_revision_id_forced_revid(self):
repos_url = self.make_repository("a")
@@ -145,7 +145,7 @@
repos = Repository.open(repos_url)
revid = repos.generate_revision_id(1, "", repos.get_mapping())
self.assertEquals(
- repos.get_mapping().generate_revision_id((repos.uuid, 1, "")),
+ repos.get_mapping().revision_id_foreign_to_bzr((repos.uuid, 1, "")),
revid)
def test_add_revision(self):
@@ -165,7 +165,7 @@
cb = self.get_commit_editor(repos_url)
cb.add_file("foo").modify("bar")
cb.close()
- revid = repos.get_mapping().generate_revision_id((repos.uuid, 1, ""))
+ revid = repos.get_mapping().revision_id_foreign_to_bzr((repos.uuid, 1, ""))
repos.add_signature_text(revid, "TEXT")
self.assertTrue(repos.has_signature_for_revision_id(revid))
self.assertEquals(repos.get_signature_text(revid), "TEXT")
@@ -650,7 +650,7 @@
bzrdir = self.make_client_and_bzrdir('d', 'dc')
repository = bzrdir.find_repository()
self.assertFalse(repository.has_revision(
- repository.get_mapping().generate_revision_id((repository.uuid, 5, ""))))
+ repository.get_mapping().revision_id_foreign_to_bzr((repository.uuid, 5, ""))))
def test_get_parent_map(self):
repos_url = self.make_client('d', 'dc')
@@ -789,7 +789,7 @@
(num, date, author) = self.client_commit("dc", "Second Message")
repository = Repository.open("svn+%s" % repos_url)
mapping = repository.get_mapping()
- revid = mapping.generate_revision_id((repository.uuid, 2, ""))
+ revid = mapping.revision_id_foreign_to_bzr((repository.uuid, 2, ""))
rev = repository.get_revision("myrevid")
self.assertEqual((repository.generate_revision_id(1, "", mapping),),
rev.parent_ids)
@@ -946,14 +946,14 @@
repository = Repository.open("svn+%s" % repos_url)
mapping = repository.get_mapping()
self.assertEqual(
- mapping.generate_revision_id((repository.uuid, 1, "bla/bloe")),
+ mapping.revision_id_foreign_to_bzr((repository.uuid, 1, "bla/bloe")),
repository.generate_revision_id(1, "bla/bloe", mapping))
def test_generate_revision_id_zero(self):
repos_url = self.make_client('d', 'dc')
repository = Repository.open("svn+%s" % repos_url)
mapping = repository.get_mapping()
- self.assertEqual(mapping.generate_revision_id((repository.uuid, 0, "")),
+ self.assertEqual(mapping.revision_id_foreign_to_bzr((repository.uuid, 0, "")),
repository.generate_revision_id(0, "", mapping))
def test_lookup_revision_id(self):
@@ -979,7 +979,7 @@
repository = Repository.open("svn+%s" % repos_url)
mapping = repository.get_mapping()
self.assertEqual(("", 1), repository.lookup_revision_id(
- mapping.generate_revision_id((repository.uuid, 1, "")))[:2])
+ mapping.revision_id_foreign_to_bzr((repository.uuid, 1, "")))[:2])
self.assertEqual(("", 1),
repository.lookup_revision_id("myid")[:2])
@@ -994,7 +994,7 @@
repository = Repository.open("svn+%s" % repos_url)
mapping = repository.get_mapping()
self.assertEqual(("", 1), repository.lookup_revision_id(
- mapping.generate_revision_id((repository.uuid, 1, "")))[:2])
+ mapping.revision_id_foreign_to_bzr((repository.uuid, 1, "")))[:2])
self.assertRaises(NoSuchRevision, repository.lookup_revision_id,
"corrupt-entry")
@@ -1013,9 +1013,9 @@
repository = Repository.open("svn+%s" % repos_url)
mapping = repository.get_mapping()
self.assertEqual(("", 2), repository.lookup_revision_id(
- mapping.generate_revision_id((repository.uuid, 2, "")))[:2])
+ mapping.revision_id_foreign_to_bzr((repository.uuid, 2, "")))[:2])
self.assertEqual(("", 1), repository.lookup_revision_id(
- mapping.generate_revision_id((repository.uuid, 1, "")))[:2])
+ mapping.revision_id_foreign_to_bzr((repository.uuid, 1, "")))[:2])
self.assertEqual(("", 2), repository.lookup_revision_id(
"corrupt-entry")[:2])
@@ -1056,7 +1056,7 @@
mapping = repository.get_mapping()
self.assertRaises(NoSuchRevision,
repository.lookup_revision_id,
- mapping.generate_revision_id(("invaliduuid", 0, "")))
+ mapping.revision_id_foreign_to_bzr(("invaliduuid", 0, "")))
def test_check(self):
repos_url = self.make_client('d', 'dc')
=== modified file 'tests/test_tree.py'
--- a/tests/test_tree.py 2008-08-29 15:39:07 +0000
+++ b/tests/test_tree.py 2008-08-29 16:19:34 +0000
@@ -179,12 +179,12 @@
mapping = repos.get_mapping()
inv = Inventory(root_id='blabloe')
inventory_add_external(inv, 'blabloe', 'blie/bla',
- mapping.generate_revision_id((repos.uuid, 1, "")),
+ mapping.revision_id_foreign_to_bzr((repos.uuid, 1, "")),
None, repos_url)
self.assertEqual(TreeReference(
mapping.generate_file_id(repos.uuid, 0, "", u""),
'bla', inv.path2id('blie'),
- revision=mapping.generate_revision_id((repos.uuid, 1, ""))),
+ revision=mapping.revision_id_foreign_to_bzr((repos.uuid, 1, ""))),
inv[inv.path2id('blie/bla')])
def test_add_simple_norev(self):
@@ -193,13 +193,13 @@
mapping = repos.get_mapping()
inv = Inventory(root_id='blabloe')
inventory_add_external(inv, 'blabloe', 'bla',
- mapping.generate_revision_id((repos.uuid, 1, "")), None,
+ mapping.revision_id_foreign_to_bzr((repos.uuid, 1, "")), None,
repos_url)
self.assertEqual(TreeReference(
mapping.generate_file_id(repos.uuid, 0, "", u""),
'bla', 'blabloe',
- revision=mapping.generate_revision_id((repos.uuid, 1, ""))),
+ revision=mapping.revision_id_foreign_to_bzr((repos.uuid, 1, ""))),
inv[inv.path2id('bla')])
def test_add_simple_rev(self):
@@ -208,13 +208,13 @@
inv = Inventory(root_id='blabloe')
mapping = repos.get_mapping()
inventory_add_external(inv, 'blabloe', 'bla',
- mapping.generate_revision_id((repos.uuid, 1, "")), 0, repos_url)
+ mapping.revision_id_foreign_to_bzr((repos.uuid, 1, "")), 0, repos_url)
expected_ie = TreeReference(mapping.generate_file_id(repos.uuid, 0, "", u""),
'bla', 'blabloe',
- revision=mapping.generate_revision_id((repos.uuid, 1, "")),
+ revision=mapping.revision_id_foreign_to_bzr((repos.uuid, 1, "")),
reference_revision=NULL_REVISION)
ie = inv[inv.path2id('bla')]
self.assertEqual(NULL_REVISION, ie.reference_revision)
- self.assertEqual(mapping.generate_revision_id((repos.uuid, 1, "")),
+ self.assertEqual(mapping.revision_id_foreign_to_bzr((repos.uuid, 1, "")),
ie.revision)
self.assertEqual(expected_ie, inv[inv.path2id('bla')])
=== modified file 'tests/test_workingtree.py'
--- a/tests/test_workingtree.py 2008-08-29 15:39:07 +0000
+++ b/tests/test_workingtree.py 2008-08-29 16:19:34 +0000
@@ -460,7 +460,7 @@
tree = WorkingTree.open("dc")
tree.set_pending_merges([
- tree.branch.mapping.generate_revision_id(("a-uuid-foo", 1, "branch/fpath")), "c"])
+ tree.branch.mapping.revision_id_foreign_to_bzr(("a-uuid-foo", 1, "branch/fpath")), "c"])
self.assertEqual(
"svn-v3-none:a-uuid-foo:branch%2Ffpath:1\tc\n",
self.client_get_prop("dc", "bzr:ancestry:v3-none"))
@@ -472,7 +472,7 @@
tree = WorkingTree.open("dc")
tree.set_pending_merges([
- tree.branch.mapping.generate_revision_id(("a-uuid-foo", 1, "branch/path")), "c"])
+ tree.branch.mapping.revision_id_foreign_to_bzr(("a-uuid-foo", 1, "branch/path")), "c"])
self.assertEqual("a-uuid-foo:/branch/path:1\n",
self.client_get_prop("dc", "svk:merge"))
More information about the bazaar-commits
mailing list