From d8c7f85ecbb01c671c6e795e6fc6bdf213067670 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 6 Apr 2020 17:05:11 -0700 Subject: [PATCH] Workaround RHBZ#1821499 in desktop live notifications test A GNOME bug seems to result in us getting to GDM, not a liveuser desktop, after running 'systemctl isolate graphical.target' from a live boot to runlevel 3 since the end of March. This works around that to let the test run, as it's not really a failure of the test per se. Signed-off-by: Adam Williamson --- tests/desktop_notifications.pm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/desktop_notifications.pm b/tests/desktop_notifications.pm index 9faa2ae0..5c187a6a 100644 --- a/tests/desktop_notifications.pm +++ b/tests/desktop_notifications.pm @@ -65,6 +65,16 @@ sub run { type_very_safely get_var("USER_PASSWORD", "weakpassword"); send_key 'ret'; } + else { + # the "live boot" branch; we may need to work around + # https://bugzilla.redhat.com/show_bug.cgi?id=1821499 + # we should wind up at desktop now, but with that bug we + # hit GDM instead + if (check_screen "graphical_login", 30) { + record_soft_failure "Hit GDM unexpectedly - #1821499"; + send_key 'ret'; + } + } check_desktop_clean(tries=>30); # now, WE WAIT. this is just an unconditional wait - rather than # breaking if we see an update notification appear - so we catch