this broke the way I tend to run the oejskit tests which use testdir.runpytest for some functional tests,
I tend to setup a virtualenv in which the current py.test trunk is installed via setup.py develop, path-to-virtualenv/bin/py.test then is how I invoke py.test and it that case there is no py.test at all findable through the environment. commits-nore...@bitbucket.org wrote: > # HG changeset patch -- Bitbucket.org > # Project py-trunk > # URL http://bitbucket.org/hpk42/py-trunk/overview/ > # User holger krekel <hol...@merlinux.eu> > # Date 1262272511 -3600 > # Node ID 3b9141d6bd7df061b8f4bace364d1ea66fb0fe16 > # Parent 2f97b1b6a2cc27197238679b991a8e6a289f65b1 > internal: always use scripts found in the environment > > --- a/py/plugin/pytest_pytester.py > +++ b/py/plugin/pytest_pytester.py > @@ -307,13 +307,8 @@ class TmpTestdir: > return self.run(*fullargs) > > def _getpybinargs(self, scriptname): > - bindir = py._dir.dirpath('bin') > - if not bindir.check(): > - script = py.path.local.sysfind(scriptname) > - else: > - script = bindir.join(scriptname) > - assert script.check() > - return py.std.sys.executable, script > + script = py.path.local.sysfind(scriptname) > + return script, > > def runpython(self, script): > return self.run(py.std.sys.executable, script) > _______________________________________________ > py-svn mailing list > py-...@codespeak.net > http://codespeak.net/mailman/listinfo/py-svn > _______________________________________________ py-dev mailing list py-dev@codespeak.net http://codespeak.net/mailman/listinfo/py-dev
