Rev 5576: Get rid of all _captureVar() calls, no test failures, pfew. in file:///home/vila/src/bzr/bugs/690563-better-env-isolation/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Thu Dec 16 11:31:14 GMT 2010
At file:///home/vila/src/bzr/bugs/690563-better-env-isolation/
------------------------------------------------------------
revno: 5576
revision-id: v.ladeuil+lp at free.fr-20101216113114-bykxo3hss4dcawgf
parent: v.ladeuil+lp at free.fr-20101216104406-h6ha0p7efs79fe0p
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 690563-better-env-isolation
timestamp: Thu 2010-12-16 12:31:14 +0100
message:
Get rid of all _captureVar() calls, no test failures, pfew.
-------------- next part --------------
=== modified file 'bzrlib/plugins/launchpad/test_lp_directory.py'
--- a/bzrlib/plugins/launchpad/test_lp_directory.py 2010-12-03 11:16:25 +0000
+++ b/bzrlib/plugins/launchpad/test_lp_directory.py 2010-12-16 11:31:14 +0000
@@ -298,7 +298,7 @@
self.server = self.server_class()
self.server.start_server()
# Ensure we don't clobber env
- self._captureVar('BZR_LP_XMLRPC_URL', None)
+ self.overrideEnv('BZR_LP_XMLRPC_URL', None)
def tearDown(self):
self.server.stop_server()
=== modified file 'bzrlib/plugins/launchpad/test_lp_service.py'
--- a/bzrlib/plugins/launchpad/test_lp_service.py 2010-11-26 17:33:55 +0000
+++ b/bzrlib/plugins/launchpad/test_lp_service.py 2010-12-16 11:31:14 +0000
@@ -32,7 +32,7 @@
def setUp(self):
super(LaunchpadServiceTests, self).setUp()
# make sure we have a reproducible standard environment
- self._captureVar('BZR_LP_XMLRPC_URL', None)
+ self.overrideEnv('BZR_LP_XMLRPC_URL', None)
def test_default_service(self):
service = LaunchpadService()
=== modified file 'bzrlib/plugins/launchpad/test_register.py'
--- a/bzrlib/plugins/launchpad/test_register.py 2010-12-07 09:06:39 +0000
+++ b/bzrlib/plugins/launchpad/test_register.py 2010-12-16 11:31:14 +0000
@@ -137,7 +137,7 @@
def setUp(self):
super(TestBranchRegistration, self).setUp()
# make sure we have a reproducible standard environment
- self._captureVar('BZR_LP_XMLRPC_URL', None)
+ self.overrideEnv('BZR_LP_XMLRPC_URL', None)
def test_register_help(self):
"""register-branch accepts --help"""
@@ -296,7 +296,7 @@
def setUp(self):
super(TestGatherUserCredentials, self).setUp()
# make sure we have a reproducible standard environment
- self._captureVar('BZR_LP_XMLRPC_URL', None)
+ self.overrideEnv('BZR_LP_XMLRPC_URL', None)
def test_gather_user_credentials_has_password(self):
service = LaunchpadService()
=== modified file 'bzrlib/tests/blackbox/test_serve.py'
--- a/bzrlib/tests/blackbox/test_serve.py 2010-06-20 11:18:38 +0000
+++ b/bzrlib/tests/blackbox/test_serve.py 2010-12-16 11:31:14 +0000
@@ -225,7 +225,7 @@
# -Dhpss, and does drop some hpss logging to the file.
self.make_branch('.')
log_fname = os.getcwd() + '/server.log'
- self._captureVar('BZR_LOG', log_fname)
+ self.overrideEnv('BZR_LOG', log_fname)
process, transport = self.start_server_inet(['-Dhpss'])
branch = BzrDir.open_from_transport(transport).open_branch()
self.make_read_requests(branch)
=== modified file 'bzrlib/tests/per_transport.py'
--- a/bzrlib/tests/per_transport.py 2010-09-21 03:20:09 +0000
+++ b/bzrlib/tests/per_transport.py 2010-12-16 11:31:14 +0000
@@ -98,7 +98,7 @@
def setUp(self):
super(TransportTests, self).setUp()
- self._captureVar('BZR_NO_SMART_VFS', None)
+ self.overrideEnv('BZR_NO_SMART_VFS', None)
def check_transport_contents(self, content, transport, relpath):
"""Check that transport.get(relpath).read() == content."""
=== modified file 'bzrlib/tests/per_uifactory/__init__.py'
--- a/bzrlib/tests/per_uifactory/__init__.py 2010-09-09 07:49:00 +0000
+++ b/bzrlib/tests/per_uifactory/__init__.py 2010-12-16 11:31:14 +0000
@@ -190,7 +190,7 @@
# Remove 'TERM' == 'dumb' which causes us to *not* treat output as a
# real terminal, even though isatty returns True
- self._captureVar('TERM', None)
+ self.overrideEnv('TERM', None)
self.stderr = TTYStringIO()
self.stdout = TTYStringIO()
self.factory = ui.text.TextUIFactory(self.stdin, self.stdout,
=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py 2010-12-14 16:27:12 +0000
+++ b/bzrlib/tests/test_http.py 2010-12-16 11:31:14 +0000
@@ -1770,7 +1770,7 @@
def setUp(self):
super(SmartHTTPTunnellingTest, self).setUp()
# We use the VFS layer as part of HTTP tunnelling tests.
- self._captureVar('BZR_NO_SMART_VFS', None)
+ self.overrideEnv('BZR_NO_SMART_VFS', None)
self.transport_readonly_server = http_utils.HTTPServerWithSmarts
self.http_server = self.get_readonly_server()
=== modified file 'bzrlib/tests/test_read_bundle.py'
--- a/bzrlib/tests/test_read_bundle.py 2010-12-09 04:26:53 +0000
+++ b/bzrlib/tests/test_read_bundle.py 2010-12-16 11:31:14 +0000
@@ -69,7 +69,7 @@
# from the one we want to test, so we must inject a correct transport
# into possible_transports first).
self.possible_transports = [self.get_transport(self.bundle_name)]
- self._captureVar('BZR_NO_SMART_VFS', None)
+ self.overrideEnv('BZR_NO_SMART_VFS', None)
wt = self.create_test_bundle()
def read_mergeable_from_url(self, url):
=== modified file 'bzrlib/tests/test_smart_transport.py'
--- a/bzrlib/tests/test_smart_transport.py 2010-07-01 15:25:41 +0000
+++ b/bzrlib/tests/test_smart_transport.py 2010-12-16 11:31:14 +0000
@@ -615,7 +615,7 @@
def setUp(self):
super(TestSmartServerStreamMedium, self).setUp()
- self._captureVar('BZR_NO_SMART_VFS', None)
+ self.overrideEnv('BZR_NO_SMART_VFS', None)
def portable_socket_pair(self):
"""Return a pair of TCP sockets connected to each other.
@@ -970,7 +970,7 @@
def test_get_error_unexpected(self):
"""Error reported by server with no specific representation"""
- self._captureVar('BZR_NO_SMART_VFS', None)
+ self.overrideEnv('BZR_NO_SMART_VFS', None)
class FlakyTransport(object):
base = 'a_url'
def external_url(self):
@@ -1077,14 +1077,14 @@
def test_smart_transport_has(self):
"""Checking for file existence over smart."""
- self._captureVar('BZR_NO_SMART_VFS', None)
+ self.overrideEnv('BZR_NO_SMART_VFS', None)
self.backing_transport.put_bytes("foo", "contents of foo\n")
self.assertTrue(self.transport.has("foo"))
self.assertFalse(self.transport.has("non-foo"))
def test_smart_transport_get(self):
"""Read back a file over smart."""
- self._captureVar('BZR_NO_SMART_VFS', None)
+ self.overrideEnv('BZR_NO_SMART_VFS', None)
self.backing_transport.put_bytes("foo", "contents\nof\nfoo\n")
fp = self.transport.get("foo")
self.assertEqual('contents\nof\nfoo\n', fp.read())
@@ -1094,7 +1094,7 @@
# The path in a raised NoSuchFile exception should be the precise path
# asked for by the client. This gives meaningful and unsurprising errors
# for users.
- self._captureVar('BZR_NO_SMART_VFS', None)
+ self.overrideEnv('BZR_NO_SMART_VFS', None)
err = self.assertRaises(
errors.NoSuchFile, self.transport.get, 'not%20a%20file')
self.assertSubset([err.path], ['not%20a%20file', './not%20a%20file'])
@@ -1119,7 +1119,7 @@
def test_open_dir(self):
"""Test changing directory"""
- self._captureVar('BZR_NO_SMART_VFS', None)
+ self.overrideEnv('BZR_NO_SMART_VFS', None)
transport = self.transport
self.backing_transport.mkdir('toffee')
self.backing_transport.mkdir('toffee/apple')
@@ -1147,7 +1147,7 @@
def test_mkdir_error_readonly(self):
"""TransportNotPossible should be preserved from the backing transport."""
- self._captureVar('BZR_NO_SMART_VFS', None)
+ self.overrideEnv('BZR_NO_SMART_VFS', None)
self.start_server(readonly=True)
self.assertRaises(errors.TransportNotPossible, self.transport.mkdir,
'foo')
@@ -1261,7 +1261,7 @@
def setUp(self):
super(SmartServerRequestHandlerTests, self).setUp()
- self._captureVar('BZR_NO_SMART_VFS', None)
+ self.overrideEnv('BZR_NO_SMART_VFS', None)
def build_handler(self, transport):
"""Returns a handler for the commands in protocol version one."""
@@ -1286,10 +1286,7 @@
handler = vfs.HasRequest(None, '/')
# set environment variable after construction to make sure it's
# examined.
- # Note that we can safely clobber BZR_NO_SMART_VFS here, because setUp
- # has called _captureVar, so it will be restored to the right state
- # afterwards.
- os.environ['BZR_NO_SMART_VFS'] = ''
+ self.overrideEnv('BZR_NO_SMART_VFS', '')
self.assertRaises(errors.DisabledMethod, handler.execute)
def test_readonly_exception_becomes_transport_not_possible(self):
@@ -1602,7 +1599,7 @@
self.assertTrue(self.end_received)
def test_accept_request_and_body_all_at_once(self):
- self._captureVar('BZR_NO_SMART_VFS', None)
+ self.overrideEnv('BZR_NO_SMART_VFS', None)
mem_transport = memory.MemoryTransport()
mem_transport.put_bytes('foo', 'abcdefghij')
out_stream = StringIO()
@@ -1868,7 +1865,7 @@
self.assertTrue(self.end_received)
def test_accept_request_and_body_all_at_once(self):
- self._captureVar('BZR_NO_SMART_VFS', None)
+ self.overrideEnv('BZR_NO_SMART_VFS', None)
mem_transport = memory.MemoryTransport()
mem_transport.put_bytes('foo', 'abcdefghij')
out_stream = StringIO()
@@ -3517,7 +3514,7 @@
def setUp(self):
super(HTTPTunnellingSmokeTest, self).setUp()
# We use the VFS layer as part of HTTP tunnelling tests.
- self._captureVar('BZR_NO_SMART_VFS', None)
+ self.overrideEnv('BZR_NO_SMART_VFS', None)
def test_smart_http_medium_request_accept_bytes(self):
medium = FakeHTTPMedium()
=== modified file 'bzrlib/tests/test_win32utils.py'
--- a/bzrlib/tests/test_win32utils.py 2010-12-07 17:28:31 +0000
+++ b/bzrlib/tests/test_win32utils.py 2010-12-16 11:31:14 +0000
@@ -217,7 +217,7 @@
def test_appdata_not_using_environment(self):
# Test that we aren't falling back to the environment
first = win32utils.get_appdata_location()
- self._captureVar("APPDATA", None)
+ self.overrideEnv("APPDATA", None)
self.assertPathsEqual(first, win32utils.get_appdata_location())
def test_appdata_matches_environment(self):
@@ -234,7 +234,7 @@
def test_local_appdata_not_using_environment(self):
# Test that we aren't falling back to the environment
first = win32utils.get_local_appdata_location()
- self._captureVar("LOCALAPPDATA", None)
+ self.overrideEnv("LOCALAPPDATA", None)
self.assertPathsEqual(first, win32utils.get_local_appdata_location())
def test_local_appdata_matches_environment(self):
More information about the bazaar-commits
mailing list