summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>2011-04-30 17:40:52 +0200
committerRonny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>2011-04-30 17:40:52 +0200
commit8ed8d4ab6e368f4c3081c45ccb86d9b188ca3825 (patch)
treea371d2cf55895ad48641418dcf2641df4f321b29
parent807fdfe2e3fe0a56148458d80d0e72cd2b2df7f0 (diff)
parentf4c64696d6b4904e6e5009df96829f8d10d63a8d (diff)
downloadtox-8ed8d4ab6e368f4c3081c45ccb86d9b188ca3825.tar.gz
merge with upstream
-rw-r--r--tests/__init__.py0
-rw-r--r--tests/test_venv.py6
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/__init__.py
diff --git a/tests/test_venv.py b/tests/test_venv.py
index 953e220..e8dd793 100644
--- a/tests/test_venv.py
+++ b/tests/test_venv.py
@@ -43,7 +43,8 @@ def test_getsupportedinterpreter(monkeypatch, newconfig, mocksession):
""" % sys.executable)
venv = VirtualEnv(config.envconfigs['python'], session=mocksession)
interp = venv.getsupportedinterpreter()
- assert interp == sys.executable
+ # realpath needed for debian symlinks
+ assert interp == py.path.local(sys.executable).realpath()
monkeypatch.setattr(sys, 'platform', "win32")
monkeypatch.setattr(venv.envconfig, 'basepython', 'jython')
py.test.raises(tox.exception.UnsupportedInterpreter,
@@ -69,7 +70,8 @@ def test_create(monkeypatch, mocksession, newconfig):
if sys.platform != "win32":
i = args.index("-p")
assert i != -1, args
- assert sys.executable == args[i+1]
+ # realpath is needed for stuff like the debian symlinks
+ assert py.path.local(sys.executable).realpath() == args[i+1]
#assert Envconfig.toxworkdir in args
assert venv.getcommandpath("easy_install")
interp = venv._getliveconfig().python