From a5c0f7ffbb45c93c46f5e58d3aa88e6e55e099d2 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 2 Nov 2020 16:34:43 -0800 Subject: [PATCH] Enable several desktop tests on Workstation aarch64 disk image Signed-off-by: Adam Williamson --- main.pm | 2 +- templates.fif.json | 69 +++++++++++++++++-------------- tests/desktop_browser.pm | 2 +- tests/desktop_update_graphical.pm | 10 ++--- 4 files changed, 43 insertions(+), 40 deletions(-) diff --git a/main.pm b/main.pm index b5548b82..2ad596b7 100644 --- a/main.pm +++ b/main.pm @@ -306,7 +306,7 @@ sub load_postinstall_tests() { } autotest::loadtest $storagepost if ($storagepost); - if (get_var("UEFI") &! get_var("NO_UEFI_POST")) { + if (get_var("UEFI") &! get_var("NO_UEFI_POST") &! get_var("START_AFTER_TEST")) { autotest::loadtest "tests/uefi_postinstall.pm"; } diff --git a/templates.fif.json b/templates.fif.json index 0d14f523..fe082d1a 100644 --- a/templates.fif.json +++ b/templates.fif.json @@ -703,34 +703,6 @@ "POSTINSTALL": "autocloud" } }, - "desktop_background": { - "profiles": { - "fedora-KDE-live-iso-x86_64-*-64bit": 22, - "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50, - "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50, - "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20, - "fedora-Workstation-live-iso-x86_64-*-64bit": 20 - }, - "settings": { - "BOOTFROM": "c", - "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2", - "POSTINSTALL": "desktop_background", - "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%" - } - }, - "desktop_login": { - "profiles": { - "fedora-KDE-live-iso-x86_64-*-64bit": 30, - "fedora-Workstation-live-iso-x86_64-*-64bit": 30, - "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 30 - }, - "settings": { - "BOOTFROM": "c", - "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2", - "POSTINSTALL": "desktop_login", - "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%" - } - }, "install_blivet_resize_lvm": { "profiles": { "fedora-universal-aarch64-*-aarch64": 20, @@ -758,13 +730,43 @@ "START_AFTER_TEST": "install_lvm_ext4" } }, + "desktop_background": { + "profiles": { + "fedora-KDE-live-iso-x86_64-*-64bit": 22, + "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50, + "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50, + "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20, + "fedora-Workstation-live-iso-x86_64-*-64bit": 20, + "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 22 + }, + "settings": { + "BOOTFROM": "c", + "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2", + "POSTINSTALL": "desktop_background", + "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%" + } + }, + "desktop_login": { + "profiles": { + "fedora-KDE-live-iso-x86_64-*-64bit": 30, + "fedora-Workstation-live-iso-x86_64-*-64bit": 30, + "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 30 + }, + "settings": { + "BOOTFROM": "c", + "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2", + "POSTINSTALL": "desktop_login", + "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%" + } + }, "desktop_browser": { "profiles": { "fedora-KDE-live-iso-x86_64-*-64bit": 22, "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50, "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50, "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20, - "fedora-Workstation-live-iso-x86_64-*-64bit": 20 + "fedora-Workstation-live-iso-x86_64-*-64bit": 20, + "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 22 }, "settings": { "BOOTFROM": "c", @@ -800,7 +802,8 @@ "profiles": { "fedora-KDE-live-iso-x86_64-*-64bit": 20, "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20, - "fedora-Workstation-live-iso-x86_64-*-64bit": 20 + "fedora-Workstation-live-iso-x86_64-*-64bit": 20, + "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 22 }, "settings": { "BOOTFROM": "c", @@ -815,7 +818,8 @@ "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50, "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50, "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 20, - "fedora-Workstation-live-iso-x86_64-*-64bit": 20 + "fedora-Workstation-live-iso-x86_64-*-64bit": 20, + "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 22 }, "settings": { "BOOTFROM": "c", @@ -828,7 +832,8 @@ "profiles": { "fedora-KDE-live-iso-x86_64-*-64bit": 32, "fedora-Workstation-live-iso-ppc64le-*-ppc64le": 30, - "fedora-Workstation-live-iso-x86_64-*-64bit": 30 + "fedora-Workstation-live-iso-x86_64-*-64bit": 30, + "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 32 }, "settings": { "BOOTFROM": "c", diff --git a/tests/desktop_browser.pm b/tests/desktop_browser.pm index db7563bb..ac351e5b 100644 --- a/tests/desktop_browser.pm +++ b/tests/desktop_browser.pm @@ -32,7 +32,7 @@ sub run { # wait out animations wait_still_screen(stilltime=>2, similarity_level=>45); assert_and_click 'browser_launcher'; - assert_screen 'browser'; + assert_screen 'browser', 45; # firefox is quite grindy on startup, let it settle wait_still_screen(stilltime=>5, similarity_level=>45); # open a new tab so we don't race with the default page load diff --git a/tests/desktop_update_graphical.pm b/tests/desktop_update_graphical.pm index 3f6f36ea..4aadbbb8 100644 --- a/tests/desktop_update_graphical.pm +++ b/tests/desktop_update_graphical.pm @@ -62,12 +62,10 @@ sub run { # if we see 'download', we're in the GNOME Software 3.30.5+ # two-step process - let's hit it, and continue waiting for # for apply (only) - if (match_has_tag 'desktop_package_tool_update_download') { - wait_screen_change { assert_and_click 'desktop_package_tool_update_download'; }; - $n -= 1 if ($n > 1); - $tags = ['desktop_package_tool_update_apply']; - next; - } + wait_screen_change { click_lastmatch; }; + $n -= 1 if ($n > 1); + $tags = ['desktop_package_tool_update_apply']; + next; } # move the mouse to stop the screen blanking on idle mouse_set 10, 10;