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

moving py/bin to rootlevel bin/ and fixing tests 

--HG--
branch : trunk
This commit is contained in:
holger krekel 2009-10-29 16:53:02 +01:00
parent cc15685015
commit 92d482069c
19 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_py/test/plugin/pytest_pytester.py
View File

@ -301,7 +301,7 @@ class TmpTestdir:
return self.run(*fullargs) return self.run(*fullargs)
def _getpybinargs(self, scriptname): def _getpybinargs(self, scriptname):
bindir = py.path.local(py.__file__).dirpath("bin") bindir = py._impldir.dirpath('bin')
script = bindir.join(scriptname) script = bindir.join(scriptname)
assert script.check() assert script.check()
return py.std.sys.executable, script return py.std.sys.executable, script

0
py/bin/_findpy.py → bin/_findpy.py
View File

0
py/bin/env.cmd → bin/env.cmd
View File

0
py/bin/env.py → bin/env.py
View File

0
py/bin/py.cleanup → bin/py.cleanup
View File

0
py/bin/py.convert_unittest → bin/py.convert_unittest
View File

0
py/bin/py.countloc → bin/py.countloc
View File

0
py/bin/py.lookup → bin/py.lookup
View File

0
py/bin/py.svnwcrevert → bin/py.svnwcrevert
View File

0
py/bin/py.test → bin/py.test
View File

0
py/bin/py.which → bin/py.which
View File

0
py/bin/win32/py.cleanup.cmd → bin/win32/py.cleanup.cmd
View File

0
py/bin/win32/py.convert_unittest.cmd → bin/win32/py.convert_unittest.cmd
View File

0
py/bin/win32/py.countloc.cmd → bin/win32/py.countloc.cmd
View File

0
py/bin/win32/py.lookup.cmd → bin/win32/py.lookup.cmd
View File

0
py/bin/win32/py.svnwcrevert.cmd → bin/win32/py.svnwcrevert.cmd
View File

0
py/bin/win32/py.test.cmd → bin/win32/py.test.cmd
View File

0
py/bin/win32/py.which.cmd → bin/win32/py.which.cmd
View File

6
testing/cmdline/test_generic.py
View File

@ -1,10 +1,12 @@
import py import py
import sys import sys
binpath = py.path.local(py.__file__).dirpath("bin")
binwinpath = binpath.join("win32")
def setup_module(mod): def setup_module(mod):
mod.binpath = py._impldir.dirpath('bin')
if not mod.binpath.check():
py.test.skip("bin-source scripts not installed")
mod.binwinpath = binpath.join("win32")
mod.tmpdir = py.test.ensuretemp(__name__) mod.tmpdir = py.test.ensuretemp(__name__)
mod.iswin32 = sys.platform == "win32" mod.iswin32 = sys.platform == "win32"