From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 1 Aug 2024 13:13:24 +0000 (+0200)
Subject: tests: Drop workaround for older Ubuntu
X-Git-Tag: v25~374^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a242141fe4259cfe5b6d7df3a8eb43b6f151ce54;p=thirdparty%2Fmkosi.git

tests: Drop workaround for older Ubuntu
---

diff --git a/tests/test_initrd.py b/tests/test_initrd.py
index 461a3a821..9a5825873 100644
--- a/tests/test_initrd.py
+++ b/tests/test_initrd.py
@@ -5,7 +5,6 @@ import os
 import subprocess
 import tempfile
 import textwrap
-import time
 from collections.abc import Iterator
 from pathlib import Path
 from typing import Any
@@ -13,13 +12,10 @@ from typing import Any
 import pytest
 
 from mkosi.distributions import Distribution
-from mkosi.log import die
 from mkosi.mounts import mount
-from mkosi.run import find_binary, run
+from mkosi.run import run
 from mkosi.tree import copy_tree
-from mkosi.types import PathString
 from mkosi.user import INVOKING_USER
-from mkosi.versioncomp import GenericVersion
 
 from . import Image, ImageConfig, ci_group
 
@@ -73,23 +69,6 @@ def test_initrd(initrd: Image) -> None:
         image.qemu()
 
 
-def wait_for_device(device: PathString) -> None:
-    if (
-        find_binary("udevadm") and
-        GenericVersion(run(["udevadm", "--version"], stdout=subprocess.PIPE).stdout.strip()) >= 251
-    ):
-        run(["udevadm", "wait", "--timeout=30", "/dev/vg_mkosi/lv0"])
-        return
-
-    for i in range(30):
-        if Path(device).exists():
-            return
-
-        time.sleep(1)
-
-    die(f"Device {device} did not appear within 30 seconds")
-
-
 @pytest.mark.skipif(os.getuid() != 0, reason="mkosi-initrd LVM test can only be executed as root")
 def test_initrd_lvm(initrd: Image) -> None:
     with Image(
@@ -123,7 +102,7 @@ def test_initrd_lvm(initrd: Image) -> None:
         stack.callback(lambda: run(["vgchange", "-an", "vg_mkosi"]))
         run(["lvm", "lvcreate", "-l", "100%FREE", "-n", "lv0", "vg_mkosi"])
         run(["lvm", "lvs"])
-        wait_for_device("/dev/vg_mkosi/lv0")
+        run(["udevadm", "wait", "--timeout=30", "/dev/vg_mkosi/lv0"])
         run([f"mkfs.{image.config.distribution.filesystem()}", "-L", "root", "/dev/vg_mkosi/lv0"])
 
         with tempfile.TemporaryDirectory() as mnt, mount(Path("/dev/vg_mkosi/lv0"), Path(mnt)):
@@ -243,7 +222,7 @@ def test_initrd_luks_lvm(config: ImageConfig, initrd: Image, passphrase: Path) -
         stack.callback(lambda: run(["vgchange", "-an", "vg_mkosi"]))
         run(["lvm", "lvcreate", "-l", "100%FREE", "-n", "lv0", "vg_mkosi"])
         run(["lvm", "lvs"])
-        wait_for_device("/dev/vg_mkosi/lv0")
+        run(["udevadm", "wait", "--timeout=30", "/dev/vg_mkosi/lv0"])
         run([f"mkfs.{image.config.distribution.filesystem()}", "-L", "root", "/dev/vg_mkosi/lv0"])
 
         with tempfile.TemporaryDirectory() as mnt, mount(Path("/dev/vg_mkosi/lv0"), Path(mnt)):