p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for tests running subprocesses of py.test after test_argcomplete 

(which all still ran with argcompletion enabled) -> fail

--HG--
branch : argcomplete
This commit is contained in:
Anthon van der Neut 2013-07-31 16:03:53 +02:00
parent 6817a56270
commit e3a2e1bbf8
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
testing/test_parseopt.py
View File

@ -176,7 +176,7 @@ def test_addoption_parser_epilog(testdir):
@pytest.mark.skipif("sys.version_info < (2,5)") @pytest.mark.skipif("sys.version_info < (2,5)")
def test_argcomplete(testdir): def test_argcomplete(testdir):
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
script = os.path.join(os.getcwd(), 'test_argcomplete') script = os.path.join(os.getcwd(), 'test_argcomplete')
with open(str(script), 'w') as fp: with open(str(script), 'w') as fp:
@ -185,6 +185,10 @@ def test_argcomplete(testdir):
# so we use bash # so we use bash
fp.write('COMP_WORDBREAKS="$COMP_WORDBREAKS" $(which py.test) ' fp.write('COMP_WORDBREAKS="$COMP_WORDBREAKS" $(which py.test) '
'8>&1 9>&2') '8>&1 9>&2')
# alternative would be exteneded Testdir.{run(),_run(),popen()} to be able
# to handle a keyword argument env that replaces os.environ in popen or
# extends the copy, advantage: could not forget to restore
orgenv = os.environ.copy()
os.environ['_ARGCOMPLETE'] = "1" os.environ['_ARGCOMPLETE'] = "1"
os.environ['_ARGCOMPLETE_IFS'] = "\x0b" os.environ['_ARGCOMPLETE_IFS'] = "\x0b"
os.environ['COMP_WORDBREAKS'] = ' \\t\\n"\\\'><=;|&(:' os.environ['COMP_WORDBREAKS'] = ' \\t\\n"\\\'><=;|&(:'
@ -206,3 +210,5 @@ def test_argcomplete(testdir):
os.environ['COMP_POINT'] = str(len(os.environ['COMP_LINE'])) os.environ['COMP_POINT'] = str(len(os.environ['COMP_LINE']))
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
os.environ = orgenv.copy()