Revise desktop background checks
Split this out of install_default, because it really is not a part of that test and we do not want that test to fail because the desktop background is wrong. Make it its own test module and test suite instead. Don't do it on Rawhide, because we really can't assert anything worthwhile about Rawhide at the moment at least (this means the test runs but is a no-op and will always pass on Rawhide, unfortunately). Move the needles to a more appropriate location (this has nothing to do with anaconda) and use 'background' not 'wallpaper' naming (that's the name we use elsewhere in the project, e.g. package names). Also, run the test on updates, and add an F29 needle for this purpose. Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
d9c45454b2
commit
469a1395d0
15
needles/background/29_background.json
Normal file
15
needles/background/29_background.json
Normal file
@ -0,0 +1,15 @@
|
||||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 884,
|
||||
"ypos": 355,
|
||||
"width": 120,
|
||||
"height": 47,
|
||||
"type": "match"
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"29_background"
|
||||
]
|
||||
}
|
BIN
needles/background/29_background.png
Normal file
BIN
needles/background/29_background.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 695 KiB |
@ -10,6 +10,6 @@
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"30_wallpaper"
|
||||
"30_background"
|
||||
]
|
||||
}
|
||||
}
|
Before Width: | Height: | Size: 604 KiB After Width: | Height: | Size: 604 KiB |
55
templates
55
templates
@ -579,6 +579,39 @@
|
||||
},
|
||||
test_suite => { name => "desktop_browser" },
|
||||
},
|
||||
{
|
||||
machine => { name => "64bit" },
|
||||
prio => 20,
|
||||
product => {
|
||||
arch => "x86_64",
|
||||
distri => "fedora",
|
||||
flavor => "Workstation-live-iso",
|
||||
version => "*",
|
||||
},
|
||||
test_suite => { name => "desktop_background" },
|
||||
},
|
||||
{
|
||||
machine => { name => "64bit" },
|
||||
prio => 22,
|
||||
product => {
|
||||
arch => "x86_64",
|
||||
distri => "fedora",
|
||||
flavor => "KDE-live-iso",
|
||||
version => "*",
|
||||
},
|
||||
test_suite => { name => "desktop_background" },
|
||||
},
|
||||
{
|
||||
machine => { name => "64bit" },
|
||||
prio => 50,
|
||||
product => {
|
||||
arch => "x86_64",
|
||||
distri => "fedora",
|
||||
flavor => "Silverblue-dvd_ostree-iso",
|
||||
version => "*",
|
||||
},
|
||||
test_suite => { name => "desktop_background" },
|
||||
},
|
||||
{
|
||||
machine => { name => "64bit" },
|
||||
prio => 30,
|
||||
@ -2936,6 +2969,18 @@
|
||||
},
|
||||
test_suite => { name => "desktop_browser" },
|
||||
},
|
||||
{
|
||||
group_name => "Fedora PowerPC",
|
||||
machine => { name => "ppc64le" },
|
||||
prio => 50,
|
||||
product => {
|
||||
arch => "ppc64le",
|
||||
distri => "fedora",
|
||||
flavor => "Silverblue-dvd_ostree-iso",
|
||||
version => "*",
|
||||
},
|
||||
test_suite => { name => "desktop_background" },
|
||||
},
|
||||
{
|
||||
group_name => "Fedora AArch64",
|
||||
machine => { name => "aarch64" },
|
||||
@ -4165,7 +4210,6 @@
|
||||
settings => [
|
||||
{ key => "PACKAGE_SET", value => "default" },
|
||||
{ key => "POSTINSTALL", value => "_collect_data" },
|
||||
{ key => "IDENTIFICATION", value => "true" },
|
||||
],
|
||||
},
|
||||
{
|
||||
@ -5110,6 +5154,15 @@
|
||||
{ key => "HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" },
|
||||
],
|
||||
},
|
||||
{
|
||||
name => "desktop_background",
|
||||
settings => [
|
||||
{ key => "POSTINSTALL", value => "desktop_background" },
|
||||
{ key => "START_AFTER_TEST", value => "install_default_upload" },
|
||||
{ key => "BOOTFROM", value => "c" },
|
||||
{ key => "HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" },
|
||||
],
|
||||
},
|
||||
{
|
||||
name => "apps_startstop",
|
||||
settings => [
|
||||
|
@ -222,6 +222,30 @@
|
||||
},
|
||||
test_suite => { name => "desktop_browser" },
|
||||
},
|
||||
{
|
||||
group_name => "Fedora Updates",
|
||||
machine => { name => "64bit" },
|
||||
prio => 30,
|
||||
product => {
|
||||
arch => "x86_64",
|
||||
distri => "fedora",
|
||||
flavor => "updates-workstation",
|
||||
version => "*",
|
||||
},
|
||||
test_suite => { name => "desktop_background" },
|
||||
},
|
||||
{
|
||||
group_name => "Fedora Updates",
|
||||
machine => { name => "64bit" },
|
||||
prio => 32,
|
||||
product => {
|
||||
arch => "x86_64",
|
||||
distri => "fedora",
|
||||
flavor => "updates-kde",
|
||||
version => "*",
|
||||
},
|
||||
test_suite => { name => "desktop_background" },
|
||||
},
|
||||
{
|
||||
group_name => "Fedora Updates",
|
||||
machine => { name => "64bit" },
|
||||
|
@ -84,12 +84,6 @@ sub run {
|
||||
mouse_set(300, 800);
|
||||
# KDE can take ages to start up
|
||||
check_desktop_clean(tries=>40);
|
||||
# If we want to check that there is a correct wallpaper used, as a part
|
||||
# of self identification test, we will do it here.
|
||||
if (get_var('IDENTIFICATION') eq 'true') {
|
||||
my $version = get_var('VERSION');
|
||||
assert_screen "${version}_wallpaper";
|
||||
}
|
||||
}
|
||||
|
||||
sub test_flags {
|
||||
|
17
tests/desktop_background.pm
Normal file
17
tests/desktop_background.pm
Normal file
@ -0,0 +1,17 @@
|
||||
use base "installedtest";
|
||||
use strict;
|
||||
use testapi;
|
||||
|
||||
sub run {
|
||||
check_desktop_clean;
|
||||
# If we want to check that there is a correct background used, as a part
|
||||
# of self identification test, we will do it here. For now we don't do
|
||||
# this for Rawhide as Rawhide doesn't have its own backgrounds and we
|
||||
# don't have any requirement for what background Rawhide uses.
|
||||
my $version = get_var('VERSION');
|
||||
assert_screen "${version}_background" if ($version ne "Rawhide");
|
||||
}
|
||||
|
||||
sub test_flags {
|
||||
return { fatal => 1 };
|
||||
}
|
Loading…
Reference in New Issue
Block a user