Skip to content

Cleanup/move imports with tmpdir tests #7015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 4, 2020
Merged

Cleanup/move imports with tmpdir tests #7015

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 15 additions & 36 deletions testing/test_tmpdir.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,17 @@

import pytest
from _pytest import pathlib
from _pytest.pathlib import cleanup_numbered_dir
from _pytest.pathlib import create_cleanup_lock
from _pytest.pathlib import make_numbered_dir
from _pytest.pathlib import maybe_delete_a_numbered_dir
from _pytest.pathlib import on_rm_rf_error
from _pytest.pathlib import Path
from _pytest.pathlib import register_cleanup_lock_removal
from _pytest.pathlib import rm_rf
from _pytest.tmpdir import get_user
from _pytest.tmpdir import TempdirFactory
from _pytest.tmpdir import TempPathFactory


def test_tmpdir_fixture(testdir):
Expand All @@ -33,9 +43,6 @@ def option(self):

class TestTempdirHandler:
def test_mktemp(self, tmp_path):

from _pytest.tmpdir import TempdirFactory, TempPathFactory

config = FakeConfig(tmp_path)
t = TempdirFactory(TempPathFactory.from_config(config))
tmp = t.mktemp("world")
Expand All @@ -48,8 +55,6 @@ def test_mktemp(self, tmp_path):

def test_tmppath_relative_basetemp_absolute(self, tmp_path, monkeypatch):
"""#4425"""
from _pytest.tmpdir import TempPathFactory

monkeypatch.chdir(tmp_path)
config = FakeConfig("hello")
t = TempPathFactory.from_config(config)
Expand Down Expand Up @@ -91,7 +96,6 @@ def test_mktemp(testdir, basename, is_ok):
mytemp = testdir.tmpdir.mkdir("mytemp")
p = testdir.makepyfile(
"""
import pytest
def test_abs_path(tmpdir_factory):
tmpdir_factory.mktemp('{}', numbered=False)
""".format(
Expand Down Expand Up @@ -181,7 +185,6 @@ def test_tmpdir_fallback_tox_env(testdir, monkeypatch):
monkeypatch.delenv("USERNAME", raising=False)
testdir.makepyfile(
"""
import pytest
def test_some(tmpdir):
assert tmpdir.isdir()
"""
Expand All @@ -207,7 +210,6 @@ def test_tmpdir_fallback_uid_not_found(testdir):

testdir.makepyfile(
"""
import pytest
def test_some(tmpdir):
assert tmpdir.isdir()
"""
Expand All @@ -223,8 +225,6 @@ def test_get_user_uid_not_found():
user id does not correspond to a valid user (e.g. running pytest in a
Docker container with 'docker run -u'.
"""
from _pytest.tmpdir import get_user

assert get_user() is None


Expand All @@ -234,8 +234,6 @@ def test_get_user(monkeypatch):
required by getpass module are missing from the environment on Windows
(#1010).
"""
from _pytest.tmpdir import get_user

monkeypatch.delenv("USER", raising=False)
monkeypatch.delenv("USERNAME", raising=False)
assert get_user() is None
Expand All @@ -245,8 +243,6 @@ class TestNumberedDir:
PREFIX = "fun-"

def test_make(self, tmp_path):
from _pytest.pathlib import make_numbered_dir

for i in range(10):
d = make_numbered_dir(root=tmp_path, prefix=self.PREFIX)
assert d.name.startswith(self.PREFIX)
Expand All @@ -261,17 +257,13 @@ def test_make(self, tmp_path):
def test_cleanup_lock_create(self, tmp_path):
d = tmp_path.joinpath("test")
d.mkdir()
from _pytest.pathlib import create_cleanup_lock

lockfile = create_cleanup_lock(d)
with pytest.raises(OSError, match="cannot create lockfile in .*"):
create_cleanup_lock(d)

lockfile.unlink()

def test_lock_register_cleanup_removal(self, tmp_path):
from _pytest.pathlib import create_cleanup_lock, register_cleanup_lock_removal

lock = create_cleanup_lock(tmp_path)

registry = []
Expand All @@ -295,8 +287,6 @@ def test_lock_register_cleanup_removal(self, tmp_path):

def _do_cleanup(self, tmp_path):
self.test_make(tmp_path)
from _pytest.pathlib import cleanup_numbered_dir

cleanup_numbered_dir(
root=tmp_path,
prefix=self.PREFIX,
Expand All @@ -310,12 +300,9 @@ def test_cleanup_keep(self, tmp_path):
print(a, b)

def test_cleanup_locked(self, tmp_path):
p = make_numbered_dir(root=tmp_path, prefix=self.PREFIX)

from _pytest import pathlib

p = pathlib.make_numbered_dir(root=tmp_path, prefix=self.PREFIX)

pathlib.create_cleanup_lock(p)
create_cleanup_lock(p)

assert not pathlib.ensure_deletable(
p, consider_lock_dead_if_created_before=p.stat().st_mtime - 1
Expand All @@ -330,16 +317,14 @@ def test_cleanup_ignores_symlink(self, tmp_path):
self._do_cleanup(tmp_path)

def test_removal_accepts_lock(self, tmp_path):
folder = pathlib.make_numbered_dir(root=tmp_path, prefix=self.PREFIX)
pathlib.create_cleanup_lock(folder)
pathlib.maybe_delete_a_numbered_dir(folder)
folder = make_numbered_dir(root=tmp_path, prefix=self.PREFIX)
create_cleanup_lock(folder)
maybe_delete_a_numbered_dir(folder)
assert folder.is_dir()


class TestRmRf:
def test_rm_rf(self, tmp_path):
from _pytest.pathlib import rm_rf

adir = tmp_path / "adir"
adir.mkdir()
rm_rf(adir)
Expand All @@ -355,8 +340,6 @@ def test_rm_rf(self, tmp_path):

def test_rm_rf_with_read_only_file(self, tmp_path):
"""Ensure rm_rf can remove directories with read-only files in them (#5524)"""
from _pytest.pathlib import rm_rf

fn = tmp_path / "dir/foo.txt"
fn.parent.mkdir()

Expand All @@ -374,8 +357,6 @@ def chmod_r(self, path):

def test_rm_rf_with_read_only_directory(self, tmp_path):
"""Ensure rm_rf can remove read-only directories (#5524)"""
from _pytest.pathlib import rm_rf

adir = tmp_path / "dir"
adir.mkdir()

Expand All @@ -387,8 +368,6 @@ def test_rm_rf_with_read_only_directory(self, tmp_path):
assert not adir.is_dir()

def test_on_rm_rf_error(self, tmp_path):
from _pytest.pathlib import on_rm_rf_error

adir = tmp_path / "dir"
adir.mkdir()

Expand Down