Skip to content
Merged
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion os/debian/test/dtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading