Merge pull request #8419 from pytest-dev/all-repos_autofix_all-repos-manual

clean up mkdtemp usage
This commit is contained in:
Anthony Sottile 2021-03-09 07:04:32 -08:00 committed by GitHub
commit 38d8deb74d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 11 deletions

View File

@ -2228,7 +2228,6 @@ file:
# content of conftest.py # content of conftest.py
import os import os
import shutil
import tempfile import tempfile
import pytest import pytest
@ -2236,12 +2235,11 @@ file:
@pytest.fixture @pytest.fixture
def cleandir(): def cleandir():
with tempfile.TemporaryDirectory() as newpath:
old_cwd = os.getcwd() old_cwd = os.getcwd()
newpath = tempfile.mkdtemp()
os.chdir(newpath) os.chdir(newpath)
yield yield
os.chdir(old_cwd) os.chdir(old_cwd)
shutil.rmtree(newpath)
and declare its use in a test module via a ``usefixtures`` marker: and declare its use in a test module via a ``usefixtures`` marker:

View File

@ -1395,12 +1395,10 @@ class TestEarlyRewriteBailout:
**{ **{
"test_setup_nonexisting_cwd.py": """\ "test_setup_nonexisting_cwd.py": """\
import os import os
import shutil
import tempfile import tempfile
d = tempfile.mkdtemp() with tempfile.TemporaryDirectory() as d:
os.chdir(d) os.chdir(d)
shutil.rmtree(d)
""", """,
"test_test.py": """\ "test_test.py": """\
def test(): def test():