monkeypatch for os.environment changes

--HG--
branch : argcomplete
This commit is contained in:
Anthon van der Neut 2013-07-31 21:33:13 +02:00
parent e3a2e1bbf8
commit ef2ddb6f16
1 changed files with 8 additions and 10 deletions

View File

@ -174,7 +174,7 @@ def test_addoption_parser_epilog(testdir):
result.stdout.fnmatch_lines(["hint: hello world", "hint: from me too"]) result.stdout.fnmatch_lines(["hint: hello world", "hint: from me too"])
@pytest.mark.skipif("sys.version_info < (2,5)") @pytest.mark.skipif("sys.version_info < (2,5)")
def test_argcomplete(testdir): def test_argcomplete(testdir, monkeypatch):
if not py.path.local.sysfind('bash'): if not py.path.local.sysfind('bash'):
pytest.skip("bash not available") pytest.skip("bash not available")
import os import os
@ -188,14 +188,13 @@ def test_argcomplete(testdir):
# alternative would be exteneded Testdir.{run(),_run(),popen()} to be able # alternative would be exteneded Testdir.{run(),_run(),popen()} to be able
# to handle a keyword argument env that replaces os.environ in popen or # to handle a keyword argument env that replaces os.environ in popen or
# extends the copy, advantage: could not forget to restore # extends the copy, advantage: could not forget to restore
orgenv = os.environ.copy() monkeypatch.setenv('_ARGCOMPLETE', "1")
os.environ['_ARGCOMPLETE'] = "1" monkeypatch.setenv('_ARGCOMPLETE_IFS',"\x0b")
os.environ['_ARGCOMPLETE_IFS'] = "\x0b" monkeypatch.setenv('COMP_WORDBREAKS', ' \\t\\n"\\\'><=;|&(:')
os.environ['COMP_WORDBREAKS'] = ' \\t\\n"\\\'><=;|&(:'
arg = '--fu' arg = '--fu'
os.environ['COMP_LINE'] = "py.test " + arg monkeypatch.setenv('COMP_LINE', "py.test " + arg)
os.environ['COMP_POINT'] = str(len(os.environ['COMP_LINE'])) monkeypatch.setenv('COMP_POINT', str(len("py.test " + arg)))
result = testdir.run('bash', str(script), arg) result = testdir.run('bash', str(script), arg)
print dir(result), result.ret print dir(result), result.ret
if result.ret == 255: if result.ret == 255:
@ -206,9 +205,8 @@ def test_argcomplete(testdir):
os.mkdir('test_argcomplete.d') os.mkdir('test_argcomplete.d')
arg = 'test_argc' arg = 'test_argc'
os.environ['COMP_LINE'] = "py.test " + arg monkeypatch.setenv('COMP_LINE', "py.test " + arg)
os.environ['COMP_POINT'] = str(len(os.environ['COMP_LINE'])) monkeypatch.setenv('COMP_POINT', str(len('py.test ' + arg)))
result = testdir.run('bash', str(script), arg) result = testdir.run('bash', str(script), arg)
result.stdout.fnmatch_lines(["test_argcomplete", "test_argcomplete.d/"]) result.stdout.fnmatch_lines(["test_argcomplete", "test_argcomplete.d/"])
# restore environment # restore environment
os.environ = orgenv.copy()