From b09dd5c5679b4b4adae8872bd654a9d8cb9f5a03 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Thu, 26 Oct 2023 16:10:14 +0200 Subject: [PATCH] lib: Move default test OS to Fedora 39 Adjust the naughty, as our test output sometimes includes Uncaught (in promise) and sometimes not. --- lib/constants.py | 2 +- naughty/fedora-39/5106-journalctl-since-until-behaviour-change | 2 +- .../fedora-39/5106-journalctl-since-until-behaviour-change-2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/constants.py b/lib/constants.py index e2d423b85d..79cd045bda 100644 --- a/lib/constants.py +++ b/lib/constants.py @@ -36,5 +36,5 @@ DEFAULT_IDENTITY_FILE = os.path.join(MACHINE_DIR, "identity") DEFAULT_IDENTITY_PUB_FILE = os.path.join(MACHINE_DIR, "identity.pub") -TEST_OS_DEFAULT = "fedora-38" +TEST_OS_DEFAULT = "fedora-39" DEFAULT_IMAGE = os.environ.get("TEST_OS", TEST_OS_DEFAULT) diff --git a/naughty/fedora-39/5106-journalctl-since-until-behaviour-change b/naughty/fedora-39/5106-journalctl-since-until-behaviour-change index 0ad6bd5474..e197e1e217 100644 --- a/naughty/fedora-39/5106-journalctl-since-until-behaviour-change +++ b/naughty/fedora-39/5106-journalctl-since-until-behaviour-change @@ -2,4 +2,4 @@ Traceback (most recent call last): File "*", line *, in testEvents * testlib.Error: timeout -wait_js_cond(ph_is_present(".cockpit-log-message:contains('Created slice cockpittest.slice.')")): Uncaught (in promise) Error: condition did not become true +wait_js_cond(ph_is_present(".cockpit-log-message:contains('Created slice cockpittest.slice.')")):* condition did not become true diff --git a/naughty/fedora-39/5106-journalctl-since-until-behaviour-change-2 b/naughty/fedora-39/5106-journalctl-since-until-behaviour-change-2 index e340c7f768..45e2a3ecc0 100644 --- a/naughty/fedora-39/5106-journalctl-since-until-behaviour-change-2 +++ b/naughty/fedora-39/5106-journalctl-since-until-behaviour-change-2 @@ -1,4 +1,4 @@ Traceback (most recent call last): File "*", line *, in testRebootAndTime * - })(["January 1, 2037", ["check-journal", "AFTER BOOT", ""], ["", "Reboot", ""], ["check-journal", "BEFORE BOOT", ""]])): Uncaught (in promise) Error: condition did not become true + })(["January 1, 2037", ["check-journal", "AFTER BOOT", ""], ["", "Reboot", ""], ["check-journal", "BEFORE BOOT", ""]])):* condition did not become true