testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

Enable several desktop tests on Workstation aarch64 disk image

Browse Source 
Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-11-02 16:34:43 -08:00
parent 4c27140794
commit a5c0f7ffbb
4 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.pm
View File

@ -306,7 +306,7 @@ sub load_postinstall_tests() {
} }
autotest::loadtest $storagepost if ($storagepost); 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"; autotest::loadtest "tests/uefi_postinstall.pm";
} }

69
templates.fif.json
View File

@ -703,34 +703,6 @@
"POSTINSTALL": "autocloud" "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": { "install_blivet_resize_lvm": {
"profiles": { "profiles": {
"fedora-universal-aarch64-*-aarch64": 20, "fedora-universal-aarch64-*-aarch64": 20,
@ -758,13 +730,43 @@
"START_AFTER_TEST": "install_lvm_ext4" "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": { "desktop_browser": {
"profiles": { "profiles": {
"fedora-KDE-live-iso-x86_64-*-64bit": 22, "fedora-KDE-live-iso-x86_64-*-64bit": 22,
"fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50, "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
"fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50, "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
"fedora-Workstation-live-iso-ppc64le-*-ppc64le": 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": { "settings": {
"BOOTFROM": "c", "BOOTFROM": "c",
@ -800,7 +802,8 @@
"profiles": { "profiles": {
"fedora-KDE-live-iso-x86_64-*-64bit": 20, "fedora-KDE-live-iso-x86_64-*-64bit": 20,
"fedora-Workstation-live-iso-ppc64le-*-ppc64le": 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": { "settings": {
"BOOTFROM": "c", "BOOTFROM": "c",
@ -815,7 +818,8 @@
"fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50, "fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
"fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50, "fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 50,
"fedora-Workstation-live-iso-ppc64le-*-ppc64le": 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": { "settings": {
"BOOTFROM": "c", "BOOTFROM": "c",
@ -828,7 +832,8 @@
"profiles": { "profiles": {
"fedora-KDE-live-iso-x86_64-*-64bit": 32, "fedora-KDE-live-iso-x86_64-*-64bit": 32,
"fedora-Workstation-live-iso-ppc64le-*-ppc64le": 30, "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": { "settings": {
"BOOTFROM": "c", "BOOTFROM": "c",

2
tests/desktop_browser.pm
View File

@ -32,7 +32,7 @@ sub run {
# wait out animations # wait out animations
wait_still_screen(stilltime=>2, similarity_level=>45); wait_still_screen(stilltime=>2, similarity_level=>45);
assert_and_click 'browser_launcher'; assert_and_click 'browser_launcher';
assert_screen 'browser'; assert_screen 'browser', 45;
# firefox is quite grindy on startup, let it settle # firefox is quite grindy on startup, let it settle
wait_still_screen(stilltime=>5, similarity_level=>45); wait_still_screen(stilltime=>5, similarity_level=>45);
# open a new tab so we don't race with the default page load # open a new tab so we don't race with the default page load

10
tests/desktop_update_graphical.pm
View File

@ -62,12 +62,10 @@ sub run {
# if we see 'download', we're in the GNOME Software 3.30.5+ # if we see 'download', we're in the GNOME Software 3.30.5+
# two-step process - let's hit it, and continue waiting for # two-step process - let's hit it, and continue waiting for
# for apply (only) # for apply (only)
if (match_has_tag 'desktop_package_tool_update_download') { wait_screen_change { click_lastmatch; };
wait_screen_change { assert_and_click 'desktop_package_tool_update_download'; }; $n -= 1 if ($n > 1);
$n -= 1 if ($n > 1); $tags = ['desktop_package_tool_update_apply'];
$tags = ['desktop_package_tool_update_apply']; next;
next;
}
} }
# move the mouse to stop the screen blanking on idle # move the mouse to stop the screen blanking on idle
mouse_set 10, 10; mouse_set 10, 10;