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

revert benjamin's change: script could be py.test.exe so we cannot 

just return "python,script".  When was the actual problem occuring?
This commit is contained in:
holger krekel 2010-11-13 11:44:58 +01:00
parent 076e03e90f
commit 868848a9a6
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
_pytest/pytester.py
View File

@ -451,7 +451,10 @@ class TmpTestdir:
if not self.request.config.getvalue("notoolsonpath"): if not self.request.config.getvalue("notoolsonpath"):
script = py.path.local.sysfind(scriptname) script = py.path.local.sysfind(scriptname)
assert script, "script %r not found" % scriptname assert script, "script %r not found" % scriptname
return (py.std.sys.executable, script,) # XXX we rely on script refering to the correct environment
# we cannot use "(py.std.sys.executable,script)"
# becaue on windows the script is e.g. a py.test.exe
return (script,)
else: else:
py.test.skip("cannot run %r with --no-tools-on-path" % scriptname) py.test.skip("cannot run %r with --no-tools-on-path" % scriptname)