diff options
| author | holger krekel <holger@merlinux.eu> | 2014-07-20 11:27:59 +0200 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2014-07-20 11:27:59 +0200 |
| commit | 2a1b4b9ead07c0d2dde61640fb47012cbc236edd (patch) | |
| tree | 8b5d4bf462200075fa7c3f1fe6acb45fbc0e57ec /tests | |
| parent | d95962973c14568343cafb62be4279d4312d5975 (diff) | |
| parent | 59bd2df040b608a02d3708c2c461c1678274452f (diff) | |
| download | tox-2a1b4b9ead07c0d2dde61640fb47012cbc236edd.tar.gz | |
merge Alexander's "multi-dimensional" PR.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_config.py | 8 | ||||
| -rw-r--r-- | tests/test_venv.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/test_config.py b/tests/test_config.py index d7a7451..28afa6c 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -554,7 +554,7 @@ class TestConfigTestEnv: envconfig = config.envconfigs['python'] assert envconfig.envpython == envconfig.envbindir.join("python") - @pytest.mark.parametrize("bp", ["jython", "pypy"]) + @pytest.mark.parametrize("bp", ["jython", "pypy", "pypy3"]) def test_envbindir_jython(self, tmpdir, newconfig, bp): config = newconfig(""" [testenv] @@ -948,7 +948,7 @@ class TestGlobalOptions: assert str(env.basepython) == sys.executable def test_default_environments(self, tmpdir, newconfig, monkeypatch): - envs = "py26,py27,py31,py32,py33,jython,pypy" + envs = "py26,py27,py31,py32,py33,py34,jython,pypy,pypy3" inisource = """ [tox] envlist = %s @@ -960,8 +960,8 @@ class TestGlobalOptions: env = config.envconfigs[name] if name == "jython": assert env.basepython == "jython" - elif name == "pypy": - assert env.basepython == "pypy" + elif name.startswith("pypy"): + assert env.basepython == name else: assert name.startswith("py") bp = "python%s.%s" %(name[2], name[3]) diff --git a/tests/test_venv.py b/tests/test_venv.py index dbfec41..6482e09 100644 --- a/tests/test_venv.py +++ b/tests/test_venv.py @@ -584,7 +584,7 @@ def test_command_relative_issue26(newmocksession, tmpdir, monkeypatch): mocksession.report.not_expect("warning", "*test command found but not*") monkeypatch.setenv("PATH", str(tmpdir)) x4 = venv.getcommandpath("x", cwd=tmpdir) - assert x4.endswith('/x') + assert x4.endswith(os.sep + 'x') mocksession.report.expect("warning", "*test command found but not*") def test_sethome_only_on_option(newmocksession, monkeypatch): |