Rev 645: Fix more tests. in file:///data/jelmer/bzr-svn/noschemes/
Jelmer Vernooij
jelmer at samba.org
Sun Feb 3 20:52:30 GMT 2008
At file:///data/jelmer/bzr-svn/noschemes/
------------------------------------------------------------
revno: 645
revision-id:jelmer at samba.org-20080203205224-yrfw48o6zl6vvhsg
parent: jelmer at samba.org-20080203194138-b7m7i48nrdt2jvj4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: noschemes
timestamp: Sun 2008-02-03 21:52:24 +0100
message:
Fix more tests.
modified:
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
tests/test_fetch.py test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
tests/test_fileids.py test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
tests/test_mapping.py test_mapping.py-20080201131338-0zd86eznn4bojtee-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_upgrade.py test_upgrade.py-20070106170128-64zt3eqggg4tng1c-1
upgrade.py upgrade.py-20070106192108-0rakplee2lzah4gs-1
=== modified file 'mapping.py'
--- a/mapping.py 2008-02-03 19:41:38 +0000
+++ b/mapping.py 2008-02-03 20:52:24 +0000
@@ -361,7 +361,8 @@
"""
@classmethod
def parse_revision_id(cls, revid):
- assert revid.startswith("svn-v1:")
+ if not revid.startswith("svn-v1:"):
+ raise InvalidRevisionId(revid, "")
revid = revid[len("svn-v1:"):]
at = revid.index("@")
fash = revid.rindex("-")
@@ -384,7 +385,8 @@
"""
@classmethod
def parse_revision_id(cls, revid):
- assert revid.startswith("svn-v2:")
+ if not revid.startswith("svn-v2:"):
+ raise InvalidRevisionId(revid, "")
revid = revid[len("svn-v2:"):]
at = revid.index("@")
fash = revid.rindex("-")
=== modified file 'tests/test_fetch.py'
--- a/tests/test_fetch.py 2008-02-03 19:41:38 +0000
+++ b/tests/test_fetch.py 2008-02-03 20:52:24 +0000
@@ -1397,6 +1397,7 @@
self.client_commit("dc", "foohosts") #6
repos = remote.SvnRemoteAccess(SvnRaTransport("svn+"+repos_url), format.SvnRemoteFormat()).find_repository()
+ repos.set_branching_scheme(TrunkBranchingScheme())
mapping = repos.get_mapping()
=== modified file 'tests/test_fileids.py'
--- a/tests/test_fileids.py 2008-02-03 19:41:38 +0000
+++ b/tests/test_fileids.py 2008-02-03 20:52:24 +0000
@@ -22,6 +22,7 @@
from bzrlib.tests import TestCase
from fileids import SimpleFileIdMap
+from mapping import BzrSvnMappingv3
from scheme import TrunkBranchingScheme, NoBranchingScheme
from tests import TestCaseWithSubversionRepository
@@ -161,43 +162,47 @@
self.assertEqual(repository.generate_revision_id(1, "trunk", mapping), revid)
class TestFileMapping(TestCase):
+ def setUp(self):
+ self.mapping = BzrSvnMappingv3(NoBranchingScheme())
+
def apply_mappings(self, mappings, find_children=None, renames={}):
map = {}
- revids = mappings.keys()
- revids.sort()
- for r in revids:
+ brns = mappings.keys()
+ brns.sort()
+ for r in brns:
+ (revnum, branchpath) = r
def new_file_id(x):
if renames.has_key(r) and renames[r].has_key(x):
return renames[r][x]
- return self.mapping.generate_file_id("uuid", FIXMErevnum, FIXMEbranchpath, x)
+ return self.mapping.generate_file_id("uuid", revnum, branchpath, x)
revmap = SimpleFileIdMap._apply_changes(new_file_id, mappings[r], find_children)
map.update(dict([(x, (revmap[x],r)) for x in revmap]))
return map
def test_simple(self):
- map = self.apply_mappings({self.mapping.generate_revision_id("uuid", 1, "", "bla"): {"foo": ('A', None, None)}})
+ map = self.apply_mappings({(1, ""): {"foo": ('A', None, None)}})
self.assertEqual({ 'foo': ("1 at uuid::foo",
- self.mapping.generate_revision_id("uuid", 1, "", "bla"))
+ (1, ""))
}, map)
def test_simple_add(self):
- map = self.apply_mappings({self.mapping.generate_revision_id("uuid", 1, "", "bla"): {"": ('A', None, None), "foo": ('A', None, None)}})
- self.assertEqual({'': ('1 at uuid::', self.mapping.generate_revision_id("uuid", 1, "", "bla")),
- 'foo': ("1 at uuid::foo",
- self.mapping.generate_revision_id("uuid", 1, "", "bla"))
- }, map)
+ map = self.apply_mappings({(1, ""): {"": ('A', None, None), "foo": ('A', None, None)}})
+ self.assertEqual({
+ '': ('1 at uuid::', (1, "")),
+ 'foo': ("1 at uuid::foo", (1, ""))
+ }, map)
def test_copy(self):
def find_children(path, revid):
if path == "foo":
yield "foo/blie"
yield "foo/bla"
- map = self.apply_mappings(
- {self.mapping.generate_revision_id("uuid", 1, "", "bla"): {
+ map = self.apply_mappings({
+ (1, ""): {
"foo": ('A', None, None),
"foo/blie": ('A', None, None),
"foo/bla": ('A', None, None)},
- self.mapping.generate_revision_id("uuid", 2, "", "bla"): {
+ (2, ""): {
"foob": ('A', 'foo', 1),
"foob/bla": ('M', None, None)}
}, find_children)
@@ -206,39 +211,39 @@
def test_touchparent(self):
map = self.apply_mappings(
- {self.mapping.generate_revision_id("uuid", 1, "", "bla"): {
+ {(1, ""): {
"foo": ('A', None, None),
"foo/bla": ('A', None, None)},
- self.mapping.generate_revision_id("uuid", 2, "", "bla"): {
+ (2, ""): {
"foo/bla": ('M', None, None)}
})
- self.assertEqual(self.mapping.generate_revision_id("uuid", 1, "", "bla"),
+ self.assertEqual((1, ""),
map["foo"][1])
- self.assertEqual(self.mapping.generate_revision_id("uuid", 1, "", "bla"),
+ self.assertEqual((1, ""),
map["foo/bla"][1])
def test_usemap(self):
map = self.apply_mappings(
- {self.mapping.generate_revision_id("uuid", 1, "", "bla"): {
+ {(1, ""): {
"foo": ('A', None, None),
"foo/bla": ('A', None, None)},
- self.mapping.generate_revision_id("uuid", 2, "", "bla"): {
+ (2, ""): {
"foo/bla": ('M', None, None)}
},
- renames={self.mapping.generate_revision_id("uuid", 1, "", "bla"): {"foo": "myid"}})
+ renames={(1, ""): {"foo": "myid"}})
self.assertEqual("myid", map["foo"][0])
def test_usemap_later(self):
map = self.apply_mappings(
- {self.mapping.generate_revision_id("uuid", 1, "", "bla"): {
+ {(1, ""): {
"foo": ('A', None, None),
"foo/bla": ('A', None, None)},
- self.mapping.generate_revision_id("uuid", 2, "", "bla"): {
+ (2, ""): {
"foo/bla": ('M', None, None)}
},
- renames={self.mapping.generate_revision_id("uuid", 2, "", "bla"): {"foo": "myid"}})
+ renames={(2, ""): {"foo": "myid"}})
self.assertEqual("1 at uuid::foo", map["foo"][0])
- self.assertEqual(self.mapping.generate_revision_id("uuid", 1, "", "bla"), map["foo"][1])
+ self.assertEqual((1, ""), map["foo"][1])
class GetMapTests(TestCaseWithSubversionRepository):
def setUp(self):
=== modified file 'tests/test_mapping.py'
--- a/tests/test_mapping.py 2008-02-03 19:41:38 +0000
+++ b/tests/test_mapping.py 2008-02-03 20:52:24 +0000
@@ -25,7 +25,7 @@
from scheme import NoBranchingScheme
from bzrlib.errors import InvalidRevisionId
-from bzrlib.tests import (TestCase, adapt_tests, TestSkipped)
+from bzrlib.tests import (TestCase, adapt_tests, TestNotApplicable)
from bzrlib.revision import Revision
from bzrlib.trace import mutter
@@ -133,7 +133,7 @@
def test_fileid_map(self):
if not self.mapping.supports_roundtripping():
- raise TestSkipped
+ raise TestNotApplicable
revprops = {}
fileprops = {}
fileids = {"": "some-id", "bla/blie": "other-id"}
@@ -143,9 +143,9 @@
def test_revision(self):
if not self.mapping.supports_roundtripping():
- raise TestSkipped
+ raise TestNotApplicable
(revprops, fileprops) = self.mapping.export_revision("branchp", 432432432.0, 0, "somebody",
- {"arevprop": "val"}, "arevid", 4, ["merge1"], dict().get, NoBranchingScheme())
+ {"arevprop": "val"}, "arevid", 4, ["merge1"], dict().get)
targetrev = Revision(None)
self.mapping.import_revision(revprops, fileprops.get, targetrev)
self.assertEquals(targetrev.committer, "somebody")
@@ -155,18 +155,14 @@
def test_revision_id(self):
if not self.mapping.supports_roundtripping():
- raise TestSkipped
- scheme = NoBranchingScheme()
- (revprops, fileprops) = self.mapping.export_revision("branchp", 432432432.0, 0, "somebody",
-
- {}, "arevid", 4, ["merge1"], dict().get, scheme)
- self.assertEquals((4, "arevid"), self.mapping.get_revision_id(revprops, fileprops.get, scheme))
+ raise TestNotApplicable
+ (revprops, fileprops) = self.mapping.export_revision("branchp", 432432432.0, 0, "somebody", {}, "arevid", 4, ["merge1"], dict().get)
+ self.assertEquals((4, "arevid"), self.mapping.get_revision_id(revprops, fileprops.get))
def test_revision_id_none(self):
if not self.mapping.supports_roundtripping():
- raise TestSkipped
- scheme = NoBranchingScheme()
- self.assertEquals((None, None), self.mapping.get_revision_id({}, dict().get, scheme))
+ raise TestNotApplicable
+ self.assertEquals((None, None), self.mapping.get_revision_id({}, dict().get))
def test_parse_revision_id_unknown(self):
self.assertRaises(InvalidRevisionId,
@@ -290,5 +286,3 @@
def test_except_nonsvn(self):
self.assertRaises(InvalidRevisionId,
parse_revision_id, "blah")
-
-
=== modified file 'tests/test_repos.py'
--- a/tests/test_repos.py 2008-02-03 19:41:38 +0000
+++ b/tests/test_repos.py 2008-02-03 20:52:24 +0000
@@ -106,7 +106,7 @@
repos_url = self.make_client("a", "dc")
repos = Repository.open(repos_url)
mapping = repos.get_mapping()
- self.assertEqual({u"": (mapping.generate_file_id(repos.uuid, 0, "", u""), revid)}, repos.get_fileid_map(0, "", 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))
def test_generate_revision_id_forced_revid(self):
repos_url = self.make_client("a", "dc")
@@ -184,7 +184,7 @@
repos = Repository.open(repos_url)
self.assertEqual(2,
- len(list(repos.follow_history(1, NoBranchingScheme()))))
+ len(list(repos.follow_history(1, repos.get_mapping()))))
def test_all_revs_empty(self):
repos_url = self.make_client("a", "dc")
=== modified file 'tests/test_upgrade.py'
--- a/tests/test_upgrade.py 2008-02-03 19:41:38 +0000
+++ b/tests/test_upgrade.py 2008-02-03 20:52:24 +0000
@@ -80,7 +80,8 @@
upgrade_repository(newrepos, oldrepos, allow_changes=True)
- self.assertTrue(newrepos.has_revision(oldrepos.generate_revision_id(1, "", "none")))
+ mapping = oldrepos.get_mapping()
+ self.assertTrue(newrepos.has_revision(oldrepos.generate_revision_id(1, "", mapping)))
@skip_no_rebase
def test_single_custom(self):
@@ -103,10 +104,11 @@
upgrade_repository(newrepos, oldrepos, allow_changes=True)
- self.assertTrue(newrepos.has_revision(oldrepos.generate_revision_id(1, "", "none")))
+ mapping = oldrepos.get_mapping()
+ self.assertTrue(newrepos.has_revision(oldrepos.generate_revision_id(1, "", mapping)))
self.assertTrue(newrepos.has_revision("customrev-svn%d-upgrade" % MAPPING_VERSION))
newrepos.lock_read()
- self.assertTrue((oldrepos.generate_revision_id(1, "", "none"),),
+ self.assertTrue((oldrepos.generate_revision_id(1, "", mapping),),
tuple(newrepos.revision_parents("customrev-svn%d-upgrade" % MAPPING_VERSION)))
newrepos.unlock()
@@ -174,11 +176,12 @@
newrepos.unlock()
upgrade_repository(newrepos, oldrepos, allow_changes=True)
+ mapping = oldrepos.get_mapping()
- self.assertTrue(newrepos.has_revision(oldrepos.generate_revision_id(1, "", "none")))
+ self.assertTrue(newrepos.has_revision(oldrepos.generate_revision_id(1, "", mapping)))
self.assertTrue(newrepos.has_revision("customrev-svn%d-upgrade" % MAPPING_VERSION))
newrepos.lock_read()
- self.assertTrue((oldrepos.generate_revision_id(1, "", "none"),),
+ self.assertTrue((oldrepos.generate_revision_id(1, "", mapping),),
tuple(newrepos.revision_parents("customrev-svn%d-upgrade" % MAPPING_VERSION)))
newrepos.unlock()
@@ -202,6 +205,7 @@
file("f/a", 'w').write("blackfield")
wt.commit(message='fix it again', rev_id="anotherrev")
+ mapping = oldrepos.get_mapping()
renames = upgrade_repository(newrepos, oldrepos, allow_changes=True)
self.assertEqual({
'svn-v1:1@%s-' % oldrepos.uuid: 'svn-v3-none:%s::1' % oldrepos.uuid,
@@ -209,11 +213,11 @@
"anotherrev": "anotherrev-svn%d-upgrade" % MAPPING_VERSION},
renames)
- self.assertTrue(newrepos.has_revision(oldrepos.generate_revision_id(1, "", "none")))
+ self.assertTrue(newrepos.has_revision(oldrepos.generate_revision_id(1, "", mapping)))
self.assertTrue(newrepos.has_revision("customrev-svn%d-upgrade" % MAPPING_VERSION))
self.assertTrue(newrepos.has_revision("anotherrev-svn%d-upgrade" % MAPPING_VERSION))
newrepos.lock_read()
- self.assertTrue((oldrepos.generate_revision_id(1, "", "none"),),
+ self.assertTrue((oldrepos.generate_revision_id(1, "", mapping),),
tuple(newrepos.revision_parents("customrev-svn%d-upgrade" % MAPPING_VERSION)))
self.assertTrue(("customrev-svn%d-upgrade" % MAPPING_VERSION,),
tuple(newrepos.revision_parents("anotherrev-svn%d-upgrade" % MAPPING_VERSION)))
@@ -240,8 +244,9 @@
wt.commit(message='fix it again', rev_id="anotherrev")
upgrade_branch(b, oldrepos, allow_changes=True)
- self.assertEqual([oldrepos.generate_revision_id(0, "", "none"),
- oldrepos.generate_revision_id(1, "", "none"),
+ mapping = oldrepos.get_mapping()
+ self.assertEqual([oldrepos.generate_revision_id(0, "", mapping),
+ oldrepos.generate_revision_id(1, "", mapping),
"customrev-svn%d-upgrade" % MAPPING_VERSION,
"anotherrev-svn%d-upgrade" % MAPPING_VERSION
], b.revision_history())
@@ -266,10 +271,11 @@
file("f/a", 'w').write("blackfield")
wt.commit(message='fix it again', rev_id="anotherrev")
+ mapping = oldrepos.get_mapping()
upgrade_workingtree(wt, oldrepos, allow_changes=True)
self.assertEquals(wt.last_revision(), b.last_revision())
- self.assertEqual([oldrepos.generate_revision_id(0, "", "none"),
- oldrepos.generate_revision_id(1, "", "none"),
+ self.assertEqual([oldrepos.generate_revision_id(0, "", mapping),
+ oldrepos.generate_revision_id(1, "", mapping),
"customrev-svn%d-upgrade" % MAPPING_VERSION,
"anotherrev-svn%d-upgrade" % MAPPING_VERSION
], b.revision_history())
=== modified file 'upgrade.py'
--- a/upgrade.py 2008-02-03 18:03:33 +0000
+++ b/upgrade.py 2008-02-03 20:52:24 +0000
@@ -173,7 +173,7 @@
replay_snapshot, rebase, rebase_todo)
if new_mapping is None:
- new_mapping = get_default_mapping() # FIXME?
+ new_mapping = svn_repository.get_mapping()
# Find revisions that need to be upgraded, create
# dictionary with revision ids in key, new parents in value
More information about the bazaar-commits
mailing list