p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

testing: fix test_assertrewrite with PYTHONPYCACHEPREFIX 

Make the tests work when running with PYTHONPYCACHEPREFIX (possible when
running in a dirty environment, not under tox).
This commit is contained in:
Ran Benita 2020-10-25 01:21:47 +02:00
parent d9ac2efbcd
commit 25dee8fef6
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
testing/test_assertrewrite.py
View File

@ -786,6 +786,8 @@ def test_rewritten():
sub.chmod(old_mode) sub.chmod(old_mode)
def test_dont_write_bytecode(self, testdir, monkeypatch): def test_dont_write_bytecode(self, testdir, monkeypatch):
monkeypatch.delenv("PYTHONPYCACHEPREFIX", raising=False)
testdir.makepyfile( testdir.makepyfile(
""" """
import os import os
@ -797,7 +799,10 @@ def test_rewritten():
monkeypatch.setenv("PYTHONDONTWRITEBYTECODE", "1") monkeypatch.setenv("PYTHONDONTWRITEBYTECODE", "1")
assert testdir.runpytest_subprocess().ret == 0 assert testdir.runpytest_subprocess().ret == 0
def test_orphaned_pyc_file(self, testdir): def test_orphaned_pyc_file(self, testdir, monkeypatch):
monkeypatch.delenv("PYTHONPYCACHEPREFIX", raising=False)
monkeypatch.setattr(sys, "pycache_prefix", None, raising=False)
testdir.makepyfile( testdir.makepyfile(
""" """
import orphan import orphan
@ -826,6 +831,7 @@ def test_rewritten():
def test_cached_pyc_includes_pytest_version(self, testdir, monkeypatch): def test_cached_pyc_includes_pytest_version(self, testdir, monkeypatch):
"""Avoid stale caches (#1671)""" """Avoid stale caches (#1671)"""
monkeypatch.delenv("PYTHONDONTWRITEBYTECODE", raising=False) monkeypatch.delenv("PYTHONDONTWRITEBYTECODE", raising=False)
monkeypatch.delenv("PYTHONPYCACHEPREFIX", raising=False)
testdir.makepyfile( testdir.makepyfile(
test_foo=""" test_foo="""
def test_foo(): def test_foo():
@ -852,11 +858,13 @@ def test_rewritten():
tmp = "--basetemp=%s" % p tmp = "--basetemp=%s" % p
monkeypatch.setenv("PYTHONOPTIMIZE", "2") monkeypatch.setenv("PYTHONOPTIMIZE", "2")
monkeypatch.delenv("PYTHONDONTWRITEBYTECODE", raising=False) monkeypatch.delenv("PYTHONDONTWRITEBYTECODE", raising=False)
monkeypatch.delenv("PYTHONPYCACHEPREFIX", raising=False)
assert testdir.runpytest_subprocess(tmp).ret == 0 assert testdir.runpytest_subprocess(tmp).ret == 0
tagged = "test_pyc_vs_pyo." + PYTEST_TAG tagged = "test_pyc_vs_pyo." + PYTEST_TAG
assert tagged + ".pyo" in os.listdir("__pycache__") assert tagged + ".pyo" in os.listdir("__pycache__")
monkeypatch.undo() monkeypatch.undo()
monkeypatch.delenv("PYTHONDONTWRITEBYTECODE", raising=False) monkeypatch.delenv("PYTHONDONTWRITEBYTECODE", raising=False)
monkeypatch.delenv("PYTHONPYCACHEPREFIX", raising=False)
assert testdir.runpytest_subprocess(tmp).ret == 1 assert testdir.runpytest_subprocess(tmp).ret == 1
assert tagged + ".pyc" in os.listdir("__pycache__") assert tagged + ".pyc" in os.listdir("__pycache__")
@ -1592,10 +1600,11 @@ class TestPyCacheDir:
], ],
) )
def test_get_cache_dir(self, monkeypatch, prefix, source, expected): def test_get_cache_dir(self, monkeypatch, prefix, source, expected):
if prefix: monkeypatch.delenv("PYTHONPYCACHEPREFIX", raising=False)
if sys.version_info < (3, 8):
pytest.skip("pycache_prefix not available in py<38") if prefix is not None and sys.version_info < (3, 8):
monkeypatch.setattr(sys, "pycache_prefix", prefix) pytest.skip("pycache_prefix not available in py<38")
monkeypatch.setattr(sys, "pycache_prefix", prefix, raising=False)
assert get_cache_dir(Path(source)) == Path(expected) assert get_cache_dir(Path(source)) == Path(expected)