tests: remove custom tempdir_fixture
There is no need for a handcrafted tempdir fixture, pytest already provides a build-in `tmp_path`.
This commit is contained in:
parent
4b69d2e1c4
commit
9d7bbd674f
1 changed files with 6 additions and 12 deletions
|
|
@ -7,12 +7,6 @@ import osbuild
|
||||||
import osbuild.meta
|
import osbuild.meta
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(name="tempdir")
|
|
||||||
def tempdir_fixture():
|
|
||||||
with TemporaryDirectory(prefix="meta-") as tmp:
|
|
||||||
yield tmp
|
|
||||||
|
|
||||||
|
|
||||||
def create_runners(path, distro: str, base: str, versions):
|
def create_runners(path, distro: str, base: str, versions):
|
||||||
"""Create runner"""
|
"""Create runner"""
|
||||||
runners = []
|
runners = []
|
||||||
|
|
@ -59,9 +53,9 @@ def test_parse_name():
|
||||||
assert v == want["version"]
|
assert v == want["version"]
|
||||||
|
|
||||||
|
|
||||||
def test_runner_detection(tempdir):
|
def test_runner_detection(tmp_path):
|
||||||
|
|
||||||
runners = os.path.join(tempdir, "runners")
|
runners = os.path.join(tmp_path, "runners")
|
||||||
os.makedirs(runners)
|
os.makedirs(runners)
|
||||||
|
|
||||||
table = {
|
table = {
|
||||||
|
|
@ -100,7 +94,7 @@ def test_runner_detection(tempdir):
|
||||||
base = info["base"] or 0
|
base = info["base"] or 0
|
||||||
versions = info["versions"]
|
versions = info["versions"]
|
||||||
want = create_runners(runners, distro, str(base), versions)
|
want = create_runners(runners, distro, str(base), versions)
|
||||||
meta = osbuild.meta.Index(tempdir)
|
meta = osbuild.meta.Index(tmp_path)
|
||||||
have = meta.list_runners(distro)
|
have = meta.list_runners(distro)
|
||||||
assert len(want) == len(have)
|
assert len(want) == len(have)
|
||||||
want_all += want
|
want_all += want
|
||||||
|
|
@ -128,9 +122,9 @@ def test_runner_detection(tempdir):
|
||||||
assert len(have) == len(want_all)
|
assert len(have) == len(want_all)
|
||||||
|
|
||||||
|
|
||||||
def test_runner_sorting(tempdir):
|
def test_runner_sorting(tmp_path):
|
||||||
|
|
||||||
runners = os.path.join(tempdir, "runners")
|
runners = os.path.join(tmp_path, "runners")
|
||||||
os.makedirs(runners)
|
os.makedirs(runners)
|
||||||
|
|
||||||
table = {
|
table = {
|
||||||
|
|
@ -149,7 +143,7 @@ def test_runner_sorting(tempdir):
|
||||||
versions = info["versions"]
|
versions = info["versions"]
|
||||||
create_runners(runners, distro, str(base), versions)
|
create_runners(runners, distro, str(base), versions)
|
||||||
|
|
||||||
meta = osbuild.meta.Index(tempdir)
|
meta = osbuild.meta.Index(tmp_path)
|
||||||
have = meta.list_runners()
|
have = meta.list_runners()
|
||||||
|
|
||||||
names = [
|
names = [
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue