floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

This commit is contained in:
holger krekel 2013-08-01 14:45:24 +02:00
parent b60a8c12d5 b90d82c17f
commit 7e4b21e9a7
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_pytest/config.py
View File

@ -4,7 +4,7 @@ import py
import sys, os import sys, os
from _pytest.core import PluginManager from _pytest.core import PluginManager
import pytest import pytest
from _argcomplete import try_argcomplete, filescompleter from _pytest._argcomplete import try_argcomplete, filescompleter
# enable after some grace period for plugin writers # enable after some grace period for plugin writers
TYPE_WARN = False TYPE_WARN = False

2
testing/test_parseopt.py
View File

@ -196,7 +196,7 @@ def test_argcomplete(testdir, monkeypatch):
monkeypatch.setenv('COMP_LINE', "py.test " + arg) monkeypatch.setenv('COMP_LINE', "py.test " + arg)
monkeypatch.setenv('COMP_POINT', str(len("py.test " + arg))) 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:
# argcomplete not found # argcomplete not found
pytest.skip("argcomplete not available") pytest.skip("argcomplete not available")