summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2013-02-19 15:06:55 +0100
committerholger krekel <holger@merlinux.eu>2013-02-19 15:06:55 +0100
commitd5fd258b753401cfadf8b5abe29441ddca76bf35 (patch)
tree7d7d818767de1b4575f53b50fd69a92f9f69d595 /tests
parent30a7b7000176bbbb5766bb2a4ca7f3943b157a5d (diff)
downloadtox-d5fd258b753401cfadf8b5abe29441ddca76bf35.tar.gz
fix issue84 - pypy on windows creates a bin not a scripts venv directory
(thanks Lukasz Balcerzak)
Diffstat (limited to 'tests')
-rw-r--r--tests/test_config.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/tests/test_config.py b/tests/test_config.py
index 40d6941..9e088d4 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -1,4 +1,5 @@
import tox
+import pytest
import os, sys
from textwrap import dedent
@@ -362,14 +363,18 @@ class TestConfigTestEnv:
envconfig = config.envconfigs['python']
assert envconfig.envpython == envconfig.envbindir.join("python")
- def test_envbindir_jython(self, tmpdir, newconfig):
+ @pytest.mark.parametrize("bp", ["jython", "pypy"])
+ def test_envbindir_jython(self, tmpdir, newconfig, bp):
config = newconfig("""
[testenv]
- basepython=jython
- """)
+ basepython=%s
+ """ % bp)
assert len(config.envconfigs) == 1
envconfig = config.envconfigs['python']
- assert envconfig.envpython == envconfig.envbindir.join("jython")
+ # on win32 and linux virtualenv uses "bin" for pypy/jython
+ assert envconfig.envbindir.basename == "bin"
+ if bp == "jython":
+ assert envconfig.envpython == envconfig.envbindir.join(bp)
def test_setenv_overrides(self, tmpdir, newconfig):
config = newconfig("""