At http://people.samba.org/bzr/jelmer/bzr-svn/0.5
------------------------------------------------------------ revno: 2282 revision-id: [email protected] parent: [email protected] committer: Jelmer Vernooij <[email protected]> branch nick: 0.5 timestamp: Fri 2009-01-09 22:27:28 +0100 message: Fix blackbox tests. modified: tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535 tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1 === modified file 'tests/__init__.py' --- a/tests/__init__.py 2009-01-08 16:09:06 +0000 +++ b/tests/__init__.py 2009-01-09 21:27:28 +0000 @@ -32,6 +32,9 @@ class SubversionTestCase(subvertpy.tests.SubversionTestCase,TestCaseInTempDir): + def make_repository(self, *args, **kwargs): + return subvertpy.tests.SubversionTestCase.make_repository(self, *args, **kwargs) + def setUp(self): subvertpy.tests.SubversionTestCase.setUp(self) subvertpy.tests.SubversionTestCase.tearDown(self) === modified file 'tests/test_blackbox.py' --- a/tests/test_blackbox.py 2009-01-04 22:18:32 +0000 +++ b/tests/test_blackbox.py 2009-01-09 21:27:28 +0000 @@ -26,10 +26,15 @@ import os, sys -class TestBranch(ExternalBase, SubversionTestCase): - - def make_repository(self, path): - return SubversionTestCase.make_repository(self, path) +class TestBranch(SubversionTestCase, ExternalBase): + + def setUp(self): + SubversionTestCase.setUp(self) + SubversionTestCase.tearDown(self) + ExternalBase.setUp(self) + + def tearDown(self): + ExternalBase.tearDown(self) def test_branch_empty(self): repos_url = self.make_repository('d') @@ -72,7 +77,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 +108,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 +128,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 +141,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 +157,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 +359,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 +367,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
