# HG changeset patch -- Bitbucket.org # Project pylib # URL http://bitbucket.org/hpk42/pylib/overview # User holger krekel <hol...@merlinux.eu> # Date 1289662689 -3600 # Node ID f5b2ad2c9cb0d7e048ff93ddaec8286786148005 # Parent 1371dfb06957338aef2066da0af04888f7e2af55 slight adjustments
--- a/tox.ini +++ b/tox.ini @@ -1,6 +1,7 @@ [tox] envlist=py26,py27,py31,py27-xdist,py25,py24 -indexserver= default=http://pypi.testrun.org +indexserver= + default=http://pypi.testrun.org [testenv] changedir=testing @@ -18,5 +19,4 @@ commands= [testenv:jython] changedir=testing commands= - {envpython} {envbindir}/py.test-jython \ - -rfsxX --junitxml={envlogdir}/junit-{envname}0.xml [io_ code] + {envpython} -m pytest -rfsxX --junitxml={envlogdir}/junit-{envname}0.xml [io_ code] --- a/py/test.py +++ b/py/test.py @@ -1,7 +1,7 @@ import sys if __name__ == '__main__': - import py - sys.exit(py.test.cmdline.main()) + import pytest + sys.exit(pytest.main()) else: import sys, pytest sys.modules['py.test'] = pytest _______________________________________________ py-svn mailing list py-svn@codespeak.net http://codespeak.net/mailman/listinfo/py-svn
