IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix running tests under Python 3 without tox.

Browse Source
This commit is contained in:
Georg Brandl 2012-11-01 17:38:22 +01:00
parent c411b51fbb
commit 21d57d3125
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/run.py
View File

@ -18,14 +18,14 @@ if sys.version_info >= (3, 0):
from distutils.util import copydir_run_2to3 from distutils.util import copydir_run_2to3
testroot = path.dirname(__file__) or '.' testroot = path.dirname(__file__) or '.'
if 'BUILD_TEST_PATH' in environ: if 'BUILD_TEST_PATH' in environ:
# for tox test. # for tox testing
newroot = environ['BUILD_TEST_PATH'] newroot = environ['BUILD_TEST_PATH']
# tox install sphinx package, not need sys.path.insert. # tox installs the sphinx package, no need for sys.path.insert
else: else:
newroot = path.join(testroot, path.pardir, 'build') newroot = path.join(testroot, path.pardir, 'build')
newroot = path.join(newroot, listdir(newroot)[0], 'tests') newroot = path.join(newroot, listdir(newroot)[0], 'tests')
# always test the sphinx package from build/lib/ # always test the sphinx package from build/lib/
sys.path.insert(0, path.join(newroot, path.pardir)) sys.path.insert(0, path.abspath(path.join(newroot, path.pardir)))
copydir_run_2to3(testroot, newroot) copydir_run_2to3(testroot, newroot)
# switch to the converted dir so nose tests the right tests # switch to the converted dir so nose tests the right tests
chdir(newroot) chdir(newroot)