From 7b7b63abc124b80ec370d09efe8e78829af48d0e Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 20 Oct 2017 12:21:31 -0700 Subject: [PATCH] Workaround F26 base image g-i-s issue for upgrade tests too Since April there's been some kind of issue in the F26 base image which means gnome-initial-setup doesn't run on the first user login (as it should). The F25 base image is fine. I've not yet had the time to look into this. I put a workaround in place to prevent this problem causing false fails of update tests that boot from the F26 base image, but didn't apply the same workaround to upgrade tests, which is why upgrade tests from F26 Workstation always fail - they expect g-i-s to run on first login (which happens after the upgrade, in upgrade tests) and it doesn't. So let's just extend the workaround to apply to upgrade tests too, for now, until we can figure out why this happens. --- tests/_graphical_wait_login.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/_graphical_wait_login.pm b/tests/_graphical_wait_login.pm index e9994122..0b3e186e 100644 --- a/tests/_graphical_wait_login.pm +++ b/tests/_graphical_wait_login.pm @@ -58,13 +58,13 @@ sub run { if (get_var("DESKTOP") eq 'gnome' && (get_var("ADVISORY") || !get_var("START_AFTER_TEST"))) { # as this test gets loaded twice on the ADVISORY flow, and # we might be on the INSTALL_NO_USER flow, check whether - # this happened already. Also, as of 2017-04 there's a bug + # this happened already. Also, as of 2017-10 there's a bug # in the F26 base image which stops g-i-s running at all; - # for update testing purposes we don't want to fail, we - # just want to go ahead. So if we see the getting_started - # screen, just handle that instead. + # for update and upgrade testing purposes we don't want to + # fail, we just want to go ahead. So if we see the + # getting_started screen, just handle that instead. unless (get_var("_setup_done")) { - if (get_var("ADVISORY")) { + if (get_var("ADVISORY") || get_var("UPGRADE")) { assert_screen ["next_button", "getting_started"], 120; if (match_has_tag("next_button")) { gnome_initial_setup();