mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-30 06:34:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Use test.test_support.EnvironmentVarGuard where tests change environment vars.

Browse source
This commit is contained in:
Walter Dörwald 2009-04-26 20:51:44 +00:00
parent e73cbe7a4e
commit 4b965f6ab1
6 changed files with 36 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Lib/test/test_optparse.py
View file

@ -1464,15 +1464,9 @@ class TestHelp(BaseTest):
# we must restore its original value -- otherwise, this test
# screws things up for other tests when it's part of the Python
# test suite.
orig_columns = os.environ.get('COLUMNS')
os.environ['COLUMNS'] = str(columns)
try:
with test_support.EnvironmentVarGuard() as env:
env.set('COLUMNS', str(columns))
return InterceptingOptionParser(option_list=options)
finally:
if orig_columns is None:
del os.environ['COLUMNS']
else:
os.environ['COLUMNS'] = orig_columns
def assertHelpEquals(self, expected_output):
if type(expected_output) is types.UnicodeType:
@ -1499,16 +1493,10 @@ class TestHelp(BaseTest):
self.assertHelpEquals(_expected_help_long_opts_first)
def test_help_title_formatter(self):
save = os.environ.get("COLUMNS")
try:
os.environ["COLUMNS"] = "80"
with test_support.EnvironmentVarGuard() as env:
env.set("COLUMNS", "80")
self.parser.formatter = TitledHelpFormatter()
self.assertHelpEquals(_expected_help_title_formatter)
finally:
if save is not None:
os.environ["COLUMNS"] = save
else:
del os.environ["COLUMNS"]
def test_wrap_columns(self):
# Ensure that wrapping respects $COLUMNS environment variable.