diff --git a/os/debian/test/dtest.py b/os/debian/test/dtest.py index 2b31678..7987e64 100644 --- a/os/debian/test/dtest.py +++ b/os/debian/test/dtest.py @@ -35,7 +35,7 @@ def check(name, ok, detail=""): rc, o = vm.sh(f"w3bs-os-install --defaults --disk /dev/vda --yes --no-reboot --serial-console --password-file /tmp/pw " f"--domain ci.example.test {flags} > /tmp/o 2>&1; echo RC=$?; grep -E 'warning|FAILED|installed on' /tmp/o", a.timeout) # The console echoes the command (which itself says 'warning'): count the installer's lines only. - check("install", re.search(r"^RC=0\s*$", o, re.M) is not None and re.search(r"^warning:", o, re.M) is None, o) + check("install", re.search(r"RC=0\b", o) is not None and re.search(r"warning: ", o) is None, o) if "RC=0" not in o: _, t = vm.sh("tail -40 /var/log/w3bs-os-install.log", 60); print(t) finally: