At http://people.samba.org/bzr/jelmer/bzr-svn/0.5
------------------------------------------------------------ revno: 2279 revision-id: [email protected] parent: [email protected] committer: Jelmer Vernooij <[email protected]> branch nick: 0.5 timestamp: Sun 2009-01-04 23:18:32 +0100 message: Fix some tests. modified: commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1 mapping3/scheme.py scheme.py-20060516195850-95181aae6b272f9e tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1 === modified file 'commit.py' --- a/commit.py 2008-12-27 16:37:43 +0000 +++ b/commit.py 2009-01-04 22:18:32 +0000 @@ -200,7 +200,7 @@ child_ie.parent_id != new_inv[child_ie.file_id].parent_id or # ... name changed new_inv[child_ie.file_id].name != child_name): - mutter('removing %r(%r)', (child_name, child_ie.file_id)) + mutter('removing %r(%r)', child_name, child_ie.file_id) dir_editor.delete_entry( branch_relative_path(path, child_name), base_revnum) === modified file 'mapping3/scheme.py' --- a/mapping3/scheme.py 2008-12-16 01:57:44 +0000 +++ b/mapping3/scheme.py 2009-01-04 22:18:32 +0000 @@ -219,8 +219,8 @@ raise InvalidSvnBranchPath(path, self) def __eq__(self, other): - return (self.branch_list == other.branch_list and \ - self.tag_list == other.tag_list) + return (self.branch_list == getattr(other, "branch_list", None) and \ + self.tag_list == getattr(other, "tag_list", None)) def __ne__(self, other): return not self.__eq__(other) === modified file 'tests/test_blackbox.py' --- a/tests/test_blackbox.py 2009-01-04 20:33:05 +0000 +++ b/tests/test_blackbox.py 2009-01-04 22:18:32 +0000 @@ -72,7 +72,7 @@ dc.close() self.run_bzr("branch %s dc" % repos_url) - self.build_tree({"dc/foo": "blaaaa"}) + self.build_tree(("dc/foo", "blaaaa")) self.run_bzr("commit -m msg dc") self.run_bzr("push -d dc %s" % repos_url) self.check_output("", "status dc") @@ -103,7 +103,7 @@ dc.close() self.run_bzr("init dc") - self.build_tree({"dc/bar": "blaaaa"}) + self.build_tree(("dc/bar", "blaaaa")) self.run_bzr("add dc/bar") self.run_bzr("commit -m msg dc") self.run_bzr("push --overwrite -d dc %s/trunk" % repos_url) @@ -123,7 +123,7 @@ dc.close() self.run_bzr("branch %s dc" % repos_url) - self.build_tree({"dc/foo": "blaaaa"}) + self.build_tree(("dc/foo", "blaaaa")) self.run_bzr("commit -m msg dc") self.run_bzr("dpush -d dc %s" % repos_url) self.check_output("", "status dc") @@ -136,7 +136,7 @@ dc.close() self.run_bzr("branch %s dc" % repos_url) - self.build_tree({"dc/foofile": "blaaaa"}) + self.build_tree(("dc/foofile", "blaaaa")) self.run_bzr("add dc/foofile") self.run_bzr("commit -m msg dc") self.run_bzr("dpush -d dc %s" % repos_url) @@ -152,10 +152,10 @@ dc.close() self.run_bzr("branch %s dc" % repos_url) - self.build_tree({"dc/foofile": "blaaaa"}) + self.build_tree(("dc/foofile", "blaaaa")) self.run_bzr("add dc/foofile") self.run_bzr("commit -m msg dc") - self.build_tree({"dc/foofile": "blaaaal"}) + self.build_tree(("dc/foofile", "blaaaal")) self.run_bzr("dpush -d dc %s" % repos_url) self.check_output('modified:\n foofile\n', "status dc") @@ -354,7 +354,7 @@ def test_lightweight_checkout_lightweight_checkout(self): repos_url = self.make_client("a", "dc") - self.build_tree({'dc/foo': "test", 'dc/bla': "ha"}) + self.build_tree(('dc/foo', "test"), ('dc/bla', "ha")) self.client_add("dc/foo") self.client_add("dc/bla") self.client_commit("dc", "Msg") @@ -362,7 +362,7 @@ def test_commit(self): repos_url = self.make_client('d', 'de') - self.build_tree({'de/foo': 'bla'}) + self.build_tree(('de/foo', 'bla')) self.run_bzr("add de/foo") self.run_bzr("commit -m test de") self.check_output("2\n", "revno de") -- bazaar-commits mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
