# HG changeset patch -- Bitbucket.org
# Project pytest
# URL http://bitbucket.org/hpk42/pytest/overview
# User holger krekel <hol...@merlinux.eu>
# Date 1289645098 -3600
# Node ID 54e78a7ce4980b1cab0ed40ca0e16dbea31394c2
# Parent 755d6ca9b91b6716f55663edee404269d107f1de
revert benjamin's change: script could be py.test.exe so we cannot
just return "python,script". When was the actual problem occuring?
--- a/_pytest/pytester.py
+++ b/_pytest/pytester.py
@@ -451,7 +451,10 @@ class TmpTestdir:
if not self.request.config.getvalue("notoolsonpath"):
script = py.path.local.sysfind(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:
py.test.skip("cannot run %r with --no-tools-on-path" % scriptname)
_______________________________________________
py-svn mailing list
py-svn@codespeak.net
http://codespeak.net/mailman/listinfo/py-svn
