jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

skip tests that want to invoke py.test without proper installation 

--HG--
branch : trunk
This commit is contained in:
holger krekel 2010-10-20 22:10:35 +02:00
parent 5701ffa8d6
commit e3f48a81c5
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pytest/plugin/pytester.py
View File

@ -425,12 +425,7 @@ class TmpTestdir:
assert script, "script %r not found" % scriptname assert script, "script %r not found" % scriptname
return (script,) return (script,)
else: else:
cmdlinename = scriptname.replace(".", "") py.test.skip("cannot run %r with --no-tools-on-path" % scriptname)
assert hasattr(py.cmdline, cmdlinename), cmdlinename
source = ("import sys;sys.path.insert(0,%r);"
"import py;py.cmdline.%s()" %
(str(py._pydir.dirpath()), cmdlinename))
return (sys.executable, "-c", source,)
def runpython(self, script, prepend=True): def runpython(self, script, prepend=True):
if prepend: if prepend:

2
tox.ini
View File

@ -44,5 +44,5 @@ basepython=pypy-c
[testenv:jython] [testenv:jython]
changedir=testing changedir=testing
commands= commands=
{envpython} {envbindir}/py.test-jython \ {envpython} {envbindir}/py.test-jython --no-tools-on-path \
-rfsxX --junitxml={envlogdir}/junit-{envname}2.xml [acceptance_test.py plugin] -rfsxX --junitxml={envlogdir}/junit-{envname}2.xml [acceptance_test.py plugin]