summaryrefslogtreecommitdiff
path: root/testing/test_cacheprovider.py
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2018-11-13 09:02:52 +0100
committerDaniel Hahler <git@thequod.de>2018-11-13 09:02:52 +0100
commita6a96469ca25cc3e6066638679286ebe6cde82c1 (patch)
tree127a099cb5ca9085db986cb18adb268aed74facd /testing/test_cacheprovider.py
parentb1312147e0a6cef77e97cb80aeb9f0962115a401 (diff)
downloadpytest-a6a96469ca25cc3e6066638679286ebe6cde82c1.tar.gz
pytester: pop TOX_ENV_DIR from os.environ
Closes: https://github.com/pytest-dev/pytest/pull/4378 Fixes: https://github.com/pytest-dev/pytest/issues/4366
Diffstat (limited to 'testing/test_cacheprovider.py')
-rw-r--r--testing/test_cacheprovider.py11
1 files changed, 0 insertions, 11 deletions
diff --git a/testing/test_cacheprovider.py b/testing/test_cacheprovider.py
index 55090a2f6..2b8ca2e18 100644
--- a/testing/test_cacheprovider.py
+++ b/testing/test_cacheprovider.py
@@ -14,17 +14,6 @@ import pytest
pytest_plugins = ("pytester",)
-@pytest.fixture(scope="module", autouse=True)
-def handle_env():
- """Ensure env is like most of the tests expect it, i.e. not using tox."""
- orig_env = os.environ.pop("TOX_ENV_DIR", None)
-
- yield
-
- if orig_env is not None:
- os.environ["TOX_ENV_DIR"] = orig_env
-
-
class TestNewAPI(object):
def test_config_cache_makedir(self, testdir):
testdir.makeini("[pytest]")