diff options
| author | holger krekel <holger@merlinux.eu> | 2012-12-07 20:55:28 +0100 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2012-12-07 20:55:28 +0100 |
| commit | 06910ea87f52149988c923888e9c47ffb04c18f7 (patch) | |
| tree | 75e57691e2f141913e94679878f231e1d365a6f1 | |
| parent | 514dc18069f0273470b5cee43a89719ca6edaf4e (diff) | |
| download | tox-06910ea87f52149988c923888e9c47ffb04c18f7.tar.gz | |
fix a test that failed due to a recent merge - i'd really
like a way to ensure test are passing before merging a pull request ...
| -rw-r--r-- | tests/test_config.py | 4 | ||||
| -rw-r--r-- | tox/_pytestplugin.py | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/tests/test_config.py b/tests/test_config.py index 68ba609..df9b5d0 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -23,10 +23,8 @@ class TestVenvConfig: indexserver = xyz = xyz_repo [testenv:py1] - basepython=xyz deps=hello [testenv:py2] - basepython=hello deps= world1 :xyz:http://hello/world @@ -34,11 +32,9 @@ class TestVenvConfig: assert config.toxworkdir == tmpdir assert len(config.envconfigs) == 2 assert config.envconfigs['py1'].envdir == tmpdir.join("py1") - assert config.envconfigs['py1'].basepython == "xyz" dep = config.envconfigs['py1'].deps[0] assert dep.name == "hello" assert dep.indexserver is None - assert config.envconfigs['py2'].basepython == "hello" assert config.envconfigs['py2'].envdir == tmpdir.join("py2") dep1, dep2 = config.envconfigs['py2'].deps assert dep1.name == "world1" diff --git a/tox/_pytestplugin.py b/tox/_pytestplugin.py index fc913d6..61f6238 100644 --- a/tox/_pytestplugin.py +++ b/tox/_pytestplugin.py @@ -18,8 +18,7 @@ def pytest_configure(): def pytest_report_header(): return "tox comes from: %r" % (tox.__file__) -def pytest_funcarg__newconfig(request): - tmpdir = request.getfuncargvalue("tmpdir") +def pytest_funcarg__newconfig(request, tmpdir): def newconfig(args, source=None): if source is None: source = args |