diff options
author | holger krekel <holger@merlinux.eu> | 2013-08-15 14:10:14 +0200 |
---|---|---|
committer | holger krekel <holger@merlinux.eu> | 2013-08-15 14:10:14 +0200 |
commit | 4b19b2d4c0549c7a40a9c901e907d91170b4d48e (patch) | |
tree | 357859bc1ab660f4c3b3bf20c585a0d38f50d20b /tests | |
parent | 291950aa4bf1423674563b60fb6f1b4a260764de (diff) | |
download | tox-4b19b2d4c0549c7a40a9c901e907d91170b4d48e.tar.gz |
refactor docs and changelog1.6.0
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test_config.py | 10 | ||||
-rw-r--r-- | tests/test_interpreters.py | 5 |
2 files changed, 6 insertions, 9 deletions
diff --git a/tests/test_config.py b/tests/test_config.py index 9e35597..dd73ba3 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -522,19 +522,19 @@ class TestConfigTestEnv: monkeypatch.delenv("PIP_DOWNLOAD_CACHE", raising=False) config = newconfig(""" [testenv] - downloadcache=/the/cache + downloadcache=thecache """) envconfig = config.envconfigs['python'] - assert envconfig.downloadcache == '/the/cache' + assert envconfig.downloadcache.basename == 'thecache' def test_downloadcache_env_override(self, newconfig, monkeypatch): - monkeypatch.setenv("PIP_DOWNLOAD_CACHE", '/from/env') + monkeypatch.setenv("PIP_DOWNLOAD_CACHE", 'fromenv') config = newconfig(""" [testenv] - downloadcache=/from/config + downloadcache=somepath """) envconfig = config.envconfigs['python'] - assert envconfig.downloadcache == '/from/env' + assert envconfig.downloadcache.basename == "fromenv" def test_downloadcache_only_if_in_config(self, newconfig, tmpdir, monkeypatch): diff --git a/tests/test_interpreters.py b/tests/test_interpreters.py index 97cd3f0..39eabc6 100644 --- a/tests/test_interpreters.py +++ b/tests/test_interpreters.py @@ -10,7 +10,6 @@ def interpreters(): @pytest.mark.skipif("sys.platform != 'win32'") def test_locate_via_py(monkeypatch): - from tox._venv import locate_via_py class PseudoPy: def sysexec(self, *args): assert args[0] == '-3.2' @@ -75,10 +74,8 @@ class TestInterpreters: assert not interpreters.get_executable("12l3k1j23") def test_get_info__name(self, interpreters): - basename = os.path.basename(sys.executable) - info = interpreters.get_info(basename) + info = interpreters.get_info(executable=sys.executable) assert info.version_info == tuple(sys.version_info) - assert info.name == basename assert info.executable == sys.executable assert info.runnable |