From 259d2733b58e7c9ead22812d4df0442cd20b59ab Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 10 Oct 2023 06:56:01 +0200 Subject: [PATCH] test: Accept different criu test failure error message Current Debian testing got a new podman version which changed the error message when `criu` is not available, to "failed to check for criu version: "criu": executable file not found in $PATH". This is a bit less nice than the previous version requirement, but still clear enough, so accept it. --- test/check-application | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/check-application b/test/check-application index 3c5bada1d..af30c4d0b 100755 --- a/test/check-application +++ b/test/check-application @@ -1306,8 +1306,10 @@ class TestApplication(testlib.MachineCase): b.click('.pf-v5-c-modal-box button:contains(Checkpoint)') b.wait_not_present('.modal_dialog') - b.wait(lambda: "checkpoint/restore requires at least criu" - in b.text(".pf-v5-c-alert.pf-m-danger > .pf-v5-c-alert__description").lower()) + def criu_alert(): + text = b.text(".pf-v5-c-alert.pf-m-danger > .pf-v5-c-alert__description").lower() + return "checkpoint/restore requires at least criu" in text or "failed to check for criu" in text + b.wait(criu_alert) return # Run a container