Rev 5613: Use self.get_transport instead of transport.get_transport where possible. in file:///home/vila/src/bzr/reviews/2.3_qualified_get_transport/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Thu Jan 27 14:27:18 UTC 2011
At file:///home/vila/src/bzr/reviews/2.3_qualified_get_transport/
------------------------------------------------------------
revno: 5613
revision-id: v.ladeuil+lp at free.fr-20110127142718-1ik7fyjfflgj91j5
parent: v.ladeuil+lp at free.fr-20110127135835-rzvxbce5vx3kn9zj
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.3_qualified_get_transport
timestamp: Thu 2011-01-27 15:27:18 +0100
message:
Use self.get_transport instead of transport.get_transport where possible.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_upgrade.py'
--- a/bzrlib/tests/blackbox/test_upgrade.py 2011-01-13 15:54:03 +0000
+++ b/bzrlib/tests/blackbox/test_upgrade.py 2011-01-27 14:27:18 +0000
@@ -109,7 +109,7 @@
def test_upgrade_explicit_metaformat(self):
# users can force an upgrade to metadir format.
path = self.make_format_5_branch()
- url = transport.get_transport(self.get_url(path)).base
+ url = self.get_transport(path).base
# check --format takes effect
controldir.ControlDirFormat._set_default_format(bzrdir.BzrDirFormat5())
backup_dir = 'backup.bzr.~1~'
@@ -134,7 +134,7 @@
# users can force an upgrade to knit format from a metadir weave
# branch
self.make_metadir_weave_branch()
- url = transport.get_transport(self.get_url('metadir_weave_branch')).base
+ url = self.get_transport('metadir_weave_branch').base
# check --format takes effect
controldir.ControlDirFormat._set_default_format(bzrdir.BzrDirFormat5())
backup_dir = 'backup.bzr.~1~'
@@ -196,7 +196,7 @@
def test_upgrade_with_existing_backup_dir(self):
path = self.make_format_5_branch()
- t = transport.get_transport(self.get_url(path))
+ t = self.get_transport(path)
url = t.base
controldir.ControlDirFormat._set_default_format(bzrdir.BzrDirFormat5())
backup_dir1 = 'backup.bzr.~1~'
@@ -227,7 +227,7 @@
def test_upgrade_url(self):
self.run_bzr('init --format=weave')
- t = transport.get_transport(self.get_url())
+ t = self.get_transport()
url = t.base
out, err = self.run_bzr(['upgrade', '--format=knit', url])
backup_dir = 'backup.bzr.~1~'
=== modified file 'bzrlib/tests/per_branch/test_bound_sftp.py'
--- a/bzrlib/tests/per_branch/test_bound_sftp.py 2010-06-20 11:18:38 +0000
+++ b/bzrlib/tests/per_branch/test_bound_sftp.py 2011-01-27 14:27:18 +0000
@@ -150,7 +150,7 @@
# TestCaseWithSFTPServer only allows you to connect one time
# to the SFTP server. So we have to create a connection and
# keep it around, so that it can be reused
- __unused_t = transport.get_transport(self.get_url('.'))
+ __unused_t = self.get_transport()
wt_base = b_base.bzrdir.open_workingtree()
open('base/a', 'wb').write('new base contents\n')
=== modified file 'bzrlib/tests/per_branch/test_branch.py'
--- a/bzrlib/tests/per_branch/test_branch.py 2011-01-10 22:20:12 +0000
+++ b/bzrlib/tests/per_branch/test_branch.py 2011-01-27 14:27:18 +0000
@@ -347,7 +347,7 @@
explicit nickname is set. That is, an explicit nickname always
overrides the implicit one.
"""
- t = transport.get_transport(self.get_url())
+ t = self.get_transport()
branch = self.make_branch('bzr.dev')
# The nick will be 'bzr.dev', because there is no explicit nick set.
self.assertEqual(branch.nick, 'bzr.dev')
@@ -682,7 +682,7 @@
# they may not be initializable.
return
# supported formats must be able to init and open
- t = transport.get_transport(self.get_url())
+ t = self.get_transport()
readonly_t = transport.get_transport(self.get_readonly_url())
made_branch = self.make_branch('.')
self.failUnless(isinstance(made_branch, _mod_branch.Branch))
=== modified file 'bzrlib/tests/per_branch/test_commit.py'
--- a/bzrlib/tests/per_branch/test_commit.py 2010-02-10 17:52:08 +0000
+++ b/bzrlib/tests/per_branch/test_commit.py 2011-01-27 14:27:18 +0000
@@ -30,7 +30,7 @@
def test_commit_nicks(self):
"""Nicknames are committed to the revision"""
- transport.get_transport(self.get_url()).mkdir('bzr.dev')
+ self.get_transport().mkdir('bzr.dev')
wt = self.make_branch_and_tree('bzr.dev')
branch = wt.branch
branch.nick = "My happy branch"
=== modified file 'bzrlib/tests/per_controldir/test_controldir.py'
--- a/bzrlib/tests/per_controldir/test_controldir.py 2011-01-13 05:28:55 +0000
+++ b/bzrlib/tests/per_controldir/test_controldir.py 2011-01-27 14:27:18 +0000
@@ -804,8 +804,8 @@
'_network_name', None),
None)
# supported formats must be able to init and open
- t = transport.get_transport(self.get_url())
- readonly_t = transport.get_transport(self.get_readonly_url())
+ t = self.get_transport()
+ readonly_t = self.get_readonly_transport()
made_control = self.bzrdir_format.initialize(t.base)
self.failUnless(isinstance(made_control, controldir.ControlDir))
self.assertEqual(self.bzrdir_format,
@@ -1025,7 +1025,7 @@
# because the default open will not open them and
# they may not be initializable.
return
- t = transport.get_transport(self.get_url())
+ t = self.get_transport()
made_control = self.bzrdir_format.initialize(t.base)
made_repo = made_control.create_repository()
made_branch = made_control.create_branch()
@@ -1038,7 +1038,7 @@
# because the default open will not open them and
# they may not be initializable.
return
- t = transport.get_transport(self.get_url())
+ t = self.get_transport()
made_control = self.bzrdir_format.initialize(t.base)
made_repo = made_control.create_repository()
made_branch = made_control.create_branch()
@@ -1053,7 +1053,7 @@
# because the default open will not open them and
# they may not be initializable.
return
- t = transport.get_transport(self.get_url())
+ t = self.get_transport()
made_control = self.bzrdir_format.initialize(t.base)
made_repo = made_control.create_repository()
made_branch = made_control.create_branch()
@@ -1074,7 +1074,7 @@
# because the default open will not open them and
# they may not be initializable.
return
- t = transport.get_transport(self.get_url())
+ t = self.get_transport()
made_control = self.bzrdir_format.initialize(t.base)
made_repo = made_control.create_repository()
# Check that we have a repository object.
@@ -1089,7 +1089,7 @@
# because the default open will not open them and
# they may not be initializable.
return
- t = transport.get_transport(self.get_url())
+ t = self.get_transport()
made_control = self.bzrdir_format.initialize(t.base)
try:
made_repo = made_control.create_repository(shared=True)
@@ -1106,7 +1106,7 @@
# because the default open will not open them and
# they may not be initializable.
return
- t = transport.get_transport(self.get_url())
+ t = self.get_transport()
made_control = self.bzrdir_format.initialize(t.base)
made_repo = made_control.create_repository(shared=False)
self.assertFalse(made_repo.is_shared())
@@ -1117,7 +1117,7 @@
# because the default open will not open them and
# they may not be initializable.
return
- t = transport.get_transport(self.get_url())
+ t = self.get_transport()
made_control = self.bzrdir_format.initialize(t.base)
made_repo = made_control.create_repository()
opened_repo = made_control.open_repository()
@@ -1245,7 +1245,7 @@
def test_root_transport(self):
dir = self.make_bzrdir('.')
self.assertEqual(dir.root_transport.base,
- transport.get_transport(self.get_url('.')).base)
+ self.get_transport().base)
def test_find_repository_no_repo_under_standalone_branch(self):
# finding a repo stops at standalone branches even if there is a
@@ -1256,8 +1256,9 @@
# need a shared repository to test this.
return
url = self.get_url('intermediate')
- transport.get_transport(self.get_url()).mkdir('intermediate')
- transport.get_transport(self.get_url()).mkdir('intermediate/child')
+ t = self.get_transport()
+ t.mkdir('intermediate')
+ t.mkdir('intermediate/child')
made_control = self.bzrdir_format.initialize(url)
made_control.create_repository()
innermost_control = self.bzrdir_format.initialize(
@@ -1281,7 +1282,7 @@
# need a shared repository to test this.
return
url = self.get_url('childbzrdir')
- transport.get_transport(self.get_url()).mkdir('childbzrdir')
+ self.get_transport().mkdir('childbzrdir')
made_control = self.bzrdir_format.initialize(url)
try:
child_repo = made_control.open_repository()
@@ -1315,7 +1316,7 @@
# need a shared repository to test this.
return
url = self.get_url('childrepo')
- transport.get_transport(self.get_url()).mkdir('childrepo')
+ self.get_transport().mkdir('childrepo')
child_control = self.bzrdir_format.initialize(url)
child_repo = child_control.create_repository(shared=True)
opened_control = bzrdir.BzrDir.open(self.get_url('childrepo'))
@@ -1334,8 +1335,9 @@
# need a shared repository to test this.
return
url = self.get_url('intermediate')
- transport.get_transport(self.get_url()).mkdir('intermediate')
- transport.get_transport(self.get_url()).mkdir('intermediate/child')
+ t = self.get_transport()
+ t.mkdir('intermediate')
+ t.mkdir('intermediate/child')
made_control = self.bzrdir_format.initialize(url)
try:
child_repo = made_control.open_repository()
=== modified file 'bzrlib/tests/per_repository/test_reconcile.py'
--- a/bzrlib/tests/per_repository/test_reconcile.py 2010-06-20 11:18:38 +0000
+++ b/bzrlib/tests/per_repository/test_reconcile.py 2011-01-27 14:27:18 +0000
@@ -61,7 +61,7 @@
def setUp(self):
super(TestsNeedingReweave, self).setUp()
- t = transport.get_transport(self.get_url())
+ t = self.get_transport()
# an empty inventory with no revision for testing with.
repo = self.make_repository('inventory_without_revision')
repo.lock_write()
@@ -312,7 +312,7 @@
self.reduceLockdirTimeout()
super(TestReconcileWithIncorrectRevisionCache, self).setUp()
- t = transport.get_transport(self.get_url())
+ t = self.get_transport()
# we need a revision with two parents in the wrong order
# which should trigger reinsertion.
# and another with the first one correct but the other two not
@@ -381,7 +381,7 @@
def test_reconcile_wrong_order(self):
# a wrong order in primary parents is optionally correctable
- t = transport.get_transport(self.get_url()).clone('wrong-first-parent')
+ t = self.get_transport().clone('wrong-first-parent')
d = bzrlib.bzrdir.BzrDir.open_from_transport(t)
repo = d.open_repository()
repo.lock_read()
@@ -410,8 +410,7 @@
def test_reconcile_wrong_order_secondary_inventory(self):
# a wrong order in the parents for inventories is ignored.
- t = transport.get_transport(self.get_url()
- ).clone('reversed-secondary-parents')
+ t = self.get_transport().clone('reversed-secondary-parents')
d = bzrlib.bzrdir.BzrDir.open_from_transport(t)
repo = d.open_repository()
self.checkUnreconciled(d, repo.reconcile())
=== modified file 'bzrlib/tests/per_repository/test_repository.py'
--- a/bzrlib/tests/per_repository/test_repository.py 2011-01-12 01:01:53 +0000
+++ b/bzrlib/tests/per_repository/test_repository.py 2011-01-27 14:27:18 +0000
@@ -279,8 +279,8 @@
# they may not be initializable.
return
# supported formats must be able to init and open
- t = transport.get_transport(self.get_url())
- readonly_t = transport.get_transport(self.get_readonly_url())
+ t = self.get_transport()
+ readonly_t = self.get_readonly_transport()
made_control = self.bzrdir_format.initialize(t.base)
made_repo = self.repository_format.initialize(made_control)
self.assertEqual(made_control, made_repo.bzrdir)
@@ -339,7 +339,7 @@
# because the default open will not open them and
# they may not be initializable.
return
- t = transport.get_transport(self.get_url())
+ t = self.get_transport()
made_control = self.bzrdir_format.initialize(t.base)
made_repo = made_control.create_repository()
# Check that we have a repository object.
@@ -353,7 +353,7 @@
# because the default open will not open them and
# they may not be initializable.
return
- t = transport.get_transport(self.get_url())
+ t = self.get_transport()
made_control = self.bzrdir_format.initialize(t.base)
try:
made_repo = made_control.create_repository(shared=True)
=== modified file 'bzrlib/tests/per_versionedfile.py'
--- a/bzrlib/tests/per_versionedfile.py 2011-01-12 01:01:53 +0000
+++ b/bzrlib/tests/per_versionedfile.py 2011-01-27 14:27:18 +0000
@@ -751,7 +751,7 @@
self.assertEquals(('references_ghost', 'line_c\n'), origins[2])
def test_readonly_mode(self):
- t = transport.get_transport(self.get_url('.'))
+ t = self.get_transport()
factory = self.get_factory()
vf = factory('id', t, 0777, create=True, access_mode='w')
vf = factory('id', t, access_mode='r')
@@ -782,12 +782,12 @@
class TestWeave(TestCaseWithMemoryTransport, VersionedFileTestMixIn):
def get_file(self, name='foo'):
- return WeaveFile(name, transport.get_transport(self.get_url('.')),
+ return WeaveFile(name, self.get_transport(),
create=True,
get_scope=self.get_transaction)
def get_file_corrupted_text(self):
- w = WeaveFile('foo', transport.get_transport(self.get_url('.')),
+ w = WeaveFile('foo', self.get_transport(),
create=True,
get_scope=self.get_transaction)
w.add_lines('v1', [], ['hello\n'])
@@ -823,7 +823,7 @@
return w
def reopen_file(self, name='foo', create=False):
- return WeaveFile(name, transport.get_transport(self.get_url('.')),
+ return WeaveFile(name, self.get_transport(),
create=create,
get_scope=self.get_transaction)
@@ -831,7 +831,7 @@
self.assertRaises(errors.NoSuchFile,
WeaveFile,
'foo',
- transport.get_transport(self.get_url('.')),
+ self.get_transport(),
get_scope=self.get_transaction)
def get_factory(self):
@@ -925,7 +925,7 @@
class TestWeaveHTTP(TestCaseWithWebserver, TestReadonlyHttpMixin):
def get_file(self):
- return WeaveFile('foo', transport.get_transport(self.get_url('.')),
+ return WeaveFile('foo', self.get_transport(),
create=True,
get_scope=self.get_transaction)
@@ -1177,7 +1177,7 @@
class TestWeaveMerge(TestCaseWithMemoryTransport, MergeCasesMixin):
def get_file(self, name='foo'):
- return WeaveFile(name, transport.get_transport(self.get_url('.')),
+ return WeaveFile(name, self.get_transport(),
create=True)
def log_contents(self, w):
=== modified file 'bzrlib/tests/test_branch.py'
--- a/bzrlib/tests/test_branch.py 2011-01-10 22:20:12 +0000
+++ b/bzrlib/tests/test_branch.py 2011-01-27 14:27:18 +0000
@@ -480,7 +480,7 @@
def test_create_open_reference(self):
bzrdirformat = bzrdir.BzrDirMetaFormat1()
- t = transport.get_transport(self.get_url('.'))
+ t = self.get_transport()
t.mkdir('repo')
dir = bzrdirformat.initialize(self.get_url('repo'))
dir.create_repository()
=== modified file 'bzrlib/tests/test_btree_index.py'
--- a/bzrlib/tests/test_btree_index.py 2011-01-10 22:20:12 +0000
+++ b/bzrlib/tests/test_btree_index.py 2011-01-27 14:27:18 +0000
@@ -796,7 +796,7 @@
def test_eq_ne(self):
# two indices are equal when constructed with the same parameters:
t1 = transport.get_transport('trace+' + self.get_url(''))
- t2 = transport.get_transport(self.get_url(''))
+ t2 = self.get_transport()
self.assertTrue(
btree_index.BTreeGraphIndex(t1, 'index', None) ==
btree_index.BTreeGraphIndex(t1, 'index', None))
@@ -1151,7 +1151,7 @@
for node in nodes:
builder.add_node(*node)
stream = builder.finish()
- trans = transport.get_transport(self.get_url())
+ trans = self.get_transport()
size = trans.put_file('index', stream)
index = btree_index.BTreeGraphIndex(trans, 'index', size)
self.assertEqual(500, index.key_count())
=== modified file 'bzrlib/tests/test_bzrdir.py'
--- a/bzrlib/tests/test_bzrdir.py 2011-01-26 19:34:58 +0000
+++ b/bzrlib/tests/test_bzrdir.py 2011-01-27 14:27:18 +0000
@@ -254,7 +254,7 @@
# is the right format object found for a branch?
# create a branch with a few known format objects.
# this is not quite the same as
- t = _mod_transport.get_transport(self.get_url())
+ t = self.get_transport()
self.build_tree(["foo/", "bar/"], transport=t)
def check_format(format, url):
format.initialize(url)
@@ -270,7 +270,7 @@
_mod_transport.get_transport('.'))
def test_find_format_unknown_format(self):
- t = _mod_transport.get_transport(self.get_url())
+ t = self.get_transport()
t.mkdir('.bzr')
t.put_bytes('.bzr/branch-format', '')
self.assertRaises(UnknownFormatError,
@@ -742,23 +742,21 @@
# transport pointing at bzrdir should give a bzrdir with root transport
# set to the given transport
control = bzrdir.BzrDir.create(self.get_url())
- transport = _mod_transport.get_transport(self.get_url())
- opened_bzrdir = bzrdir.BzrDir.open_from_transport(transport)
- self.assertEqual(transport.base, opened_bzrdir.root_transport.base)
+ t = self.get_transport()
+ opened_bzrdir = bzrdir.BzrDir.open_from_transport(t)
+ self.assertEqual(t.base, opened_bzrdir.root_transport.base)
self.assertIsInstance(opened_bzrdir, bzrdir.BzrDir)
def test_open_from_transport_no_bzrdir(self):
- transport = _mod_transport.get_transport(self.get_url())
- self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport,
- transport)
+ t = self.get_transport()
+ self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport, t)
def test_open_from_transport_bzrdir_in_parent(self):
control = bzrdir.BzrDir.create(self.get_url())
- transport = _mod_transport.get_transport(self.get_url())
- transport.mkdir('subdir')
- transport = transport.clone('subdir')
- self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport,
- transport)
+ t = self.get_transport()
+ t.mkdir('subdir')
+ t = t.clone('subdir')
+ self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport, t)
def test_sprout_recursive(self):
tree = self.make_branch_and_tree('tree1',
@@ -824,9 +822,8 @@
def test_find_bzrdirs(self):
foo, bar, baz = self.make_foo_bar_baz()
- transport = _mod_transport.get_transport(self.get_url())
- self.assertEqualBzrdirs([baz, foo, bar],
- bzrdir.BzrDir.find_bzrdirs(transport))
+ t = self.get_transport()
+ self.assertEqualBzrdirs([baz, foo, bar], bzrdir.BzrDir.find_bzrdirs(t))
def make_fake_permission_denied_transport(self, transport, paths):
"""Create a transport that raises PermissionDenied for some paths."""
@@ -848,9 +845,9 @@
def test_find_bzrdirs_permission_denied(self):
foo, bar, baz = self.make_foo_bar_baz()
- transport = _mod_transport.get_transport(self.get_url())
+ t = self.get_transport()
path_filter_server, path_filter_transport = \
- self.make_fake_permission_denied_transport(transport, ['foo'])
+ self.make_fake_permission_denied_transport(t, ['foo'])
# local transport
self.assertBranchUrlsEndWith('/baz/',
bzrdir.BzrDir.find_bzrdirs(path_filter_transport))
@@ -865,10 +862,10 @@
return [s for s in transport.list_dir('') if s != 'baz']
foo, bar, baz = self.make_foo_bar_baz()
- transport = _mod_transport.get_transport(self.get_url())
- self.assertEqualBzrdirs([foo, bar],
- bzrdir.BzrDir.find_bzrdirs(transport,
- list_current=list_current))
+ t = self.get_transport()
+ self.assertEqualBzrdirs(
+ [foo, bar],
+ bzrdir.BzrDir.find_bzrdirs(t, list_current=list_current))
def test_find_bzrdirs_evaluate(self):
def evaluate(bzrdir):
@@ -880,10 +877,9 @@
return False, bzrdir.root_transport.base
foo, bar, baz = self.make_foo_bar_baz()
- transport = _mod_transport.get_transport(self.get_url())
+ t = self.get_transport()
self.assertEqual([baz.root_transport.base, foo.root_transport.base],
- list(bzrdir.BzrDir.find_bzrdirs(transport,
- evaluate=evaluate)))
+ list(bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate)))
def assertEqualBzrdirs(self, first, second):
first = list(first)
@@ -896,14 +892,14 @@
root = self.make_repository('', shared=True)
foo, bar, baz = self.make_foo_bar_baz()
qux = self.make_bzrdir('foo/qux')
- transport = _mod_transport.get_transport(self.get_url())
- branches = bzrdir.BzrDir.find_branches(transport)
+ t = self.get_transport()
+ branches = bzrdir.BzrDir.find_branches(t)
self.assertEqual(baz.root_transport.base, branches[0].base)
self.assertEqual(foo.root_transport.base, branches[1].base)
self.assertEqual(bar.root_transport.base, branches[2].base)
# ensure this works without a top-level repo
- branches = bzrdir.BzrDir.find_branches(transport.clone('foo'))
+ branches = bzrdir.BzrDir.find_branches(t.clone('foo'))
self.assertEqual(foo.root_transport.base, branches[0].base)
self.assertEqual(bar.root_transport.base, branches[1].base)
@@ -911,15 +907,15 @@
class TestMissingRepoBranchesSkipped(TestCaseWithMemoryTransport):
def test_find_bzrdirs_missing_repo(self):
- transport = _mod_transport.get_transport(self.get_url())
+ t = self.get_transport()
arepo = self.make_repository('arepo', shared=True)
abranch_url = arepo.user_url + '/abranch'
abranch = bzrdir.BzrDir.create(abranch_url).create_branch()
- transport.delete_tree('arepo/.bzr')
+ t.delete_tree('arepo/.bzr')
self.assertRaises(errors.NoRepositoryPresent,
branch.Branch.open, abranch_url)
self.make_branch('baz')
- for actual_bzrdir in bzrdir.BzrDir.find_branches(transport):
+ for actual_bzrdir in bzrdir.BzrDir.find_branches(t):
self.assertEndsWith(actual_bzrdir.user_url, '/baz/')
@@ -1101,8 +1097,7 @@
# now probe for it.
controldir.ControlDirFormat.register_prober(NotBzrDirProber)
try:
- found = bzrlib.bzrdir.BzrDirFormat.find_format(
- _mod_transport.get_transport(self.get_url()))
+ found = bzrlib.bzrdir.BzrDirFormat.find_format(self.get_transport())
self.assertIsInstance(found, NotBzrDirFormat)
finally:
controldir.ControlDirFormat.unregister_prober(NotBzrDirProber)
@@ -1144,7 +1139,7 @@
self.get_url('foo'),
force_new_tree=True,
format=format)
- t = _mod_transport.get_transport(self.get_url('.'))
+ t = self.get_transport()
self.assertFalse(t.has('foo'))
def test_clone(self):
@@ -1447,7 +1442,7 @@
def setUp(self):
super(TestGenerateBackupName, self).setUp()
- self._transport = _mod_transport.get_transport(self.get_url())
+ self._transport = self.get_transport()
bzrdir.BzrDir.create(self.get_url(),
possible_transports=[self._transport])
self._bzrdir = bzrdir.BzrDir.open_from_transport(self._transport)
=== modified file 'bzrlib/tests/test_index.py'
--- a/bzrlib/tests/test_index.py 2010-06-20 11:18:38 +0000
+++ b/bzrlib/tests/test_index.py 2011-01-27 14:27:18 +0000
@@ -1056,7 +1056,7 @@
def test_supports_unlimited_cache(self):
builder = index.GraphIndexBuilder(0, key_elements=1)
stream = builder.finish()
- trans = transport.get_transport(self.get_url())
+ trans = self.get_transport()
size = trans.put_file('index', stream)
# It doesn't matter what unlimited_cache does here, just that it can be
# passed
=== modified file 'bzrlib/tests/test_permissions.py'
--- a/bzrlib/tests/test_permissions.py 2011-01-12 01:01:53 +0000
+++ b/bzrlib/tests/test_permissions.py 2011-01-27 14:27:18 +0000
@@ -63,7 +63,7 @@
:param dir_mode: The mode for all directories
:param include_base: If false, only check the subdirectories
"""
- t = transport.get_transport(".")
+ t = test.get_transport()
if include_base:
test.assertTransportMode(t, base, dir_mode)
for root, dirs, files in os.walk(base):
@@ -178,7 +178,7 @@
# bodge around for stubsftpserver not letting use connect
# more than once
- _t = transport.get_transport(self.get_url())
+ _t = self.get_transport()
os.mkdir('local')
t_local = self.make_branch_and_tree('local')
@@ -255,7 +255,7 @@
original_umask = os.umask(umask)
try:
- t = transport.get_transport(self.get_url())
+ t = self.get_transport()
# Direct access should be masked by umask
t._sftp_open_exclusive('a', mode=0666).write('foo\n')
self.assertTransportMode(t, 'a', 0666 &~umask)
=== modified file 'bzrlib/tests/test_repository.py'
--- a/bzrlib/tests/test_repository.py 2011-01-26 19:34:58 +0000
+++ b/bzrlib/tests/test_repository.py 2011-01-27 14:27:18 +0000
@@ -604,7 +604,7 @@
class TestRepositoryConverter(TestCaseWithTransport):
def test_convert_empty(self):
- t = transport.get_transport(self.get_url('.'))
+ t = self.get_transport()
t.mkdir('repository')
repo_dir = bzrdir.BzrDirMetaFormat1().initialize('repository')
repo = weaverepo.RepositoryFormat7().initialize(repo_dir)
More information about the bazaar-commits
mailing list