Don't check version or pre-release note on banners

This reduces the coverage of the identification test a bit but
also *substantially* simplifies it. We run into a ton of problems
when we try to check the version and prerelease text on screens
where it appears on banners:

* The banners differ between variants
* The pre-release text is translated
* The banners have gradients so for RTL languages, even if some
  text is untranslated (e.g. 'Fedora 31') it appears on a
  different background color than on LTR languages
* The prerelease text is dark red; if it appears on a dark blue
  area of the banner this can trigger an os-autoinst needle
  comparison bug: https://progress.opensuse.org/issues/56822

All of this together means we wind up continually fighting these
checks and we have a whole forest of needles just for them, and
it doesn't seem worthwhile. So let's drop all the places where
we were checking version and prerelease on banners, and only
check them in two places where they appear on a grey background,
which avoids most of the problems (we just need one version
needle per release, and one prerelease needle per language).

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2019-10-16 11:08:24 -07:00
parent 079b969fab
commit b55782358d
26 changed files with 11 additions and 195 deletions

View File

@ -1,16 +0,0 @@
{
"area": [
{
"width": 136,
"ypos": 34,
"xpos": 86,
"height": 18,
"type": "match"
}
],
"properties": [],
"tags": [
"LANGUAGE-arabic",
"prerelease_note"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 82 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"xpos": 764,
"type": "match",
"height": 25,
"ypos": 35,
"width": 138
}
],
"properties": [],
"tags": [
"LANGUAGE-french",
"prerelease_note"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 88 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"ypos": 37,
"width": 141,
"xpos": 791,
"height": 19,
"type": "match"
}
],
"properties": [],
"tags": [
"LANGUAGE-japanese",
"prerelease_note"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 106 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"ypos": 40,
"height": 27,
"type": "match",
"xpos": 791,
"width": 141
}
],
"properties": [],
"tags": [
"LANGUAGE-japanese",
"prerelease_note"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 111 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"xpos": 780,
"ypos": 33,
"width": 159,
"height": 26,
"type": "match"
}
],
"properties": [],
"tags": [
"prerelease_note"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 95 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"xpos": 738,
"ypos": 33,
"width": 159,
"height": 26,
"type": "match"
}
],
"properties": [],
"tags": [
"prerelease_note"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 84 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"height": 26,
"type": "match",
"width": 159,
"xpos": 781,
"ypos": 60
}
],
"properties": [],
"tags": [
"prerelease_note"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 85 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"xpos": 797,
"ypos": 12,
"width": 93,
"height": 31,
"type": "match"
}
],
"properties": [],
"tags": [
"version_29_ident"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"xpos": 797,
"ypos": 39,
"width": 93,
"height": 32,
"type": "match"
}
],
"properties": [],
"tags": [
"version_30_ident"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"type": "match",
"width": 90,
"height": 20,
"xpos": 50,
"ypos": 12
}
],
"properties": [],
"tags": [
"version_31_ident"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 82 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"xpos": 783,
"ypos": 41,
"width": 90,
"height": 18,
"type": "match"
}
],
"properties": [],
"tags": [
"version_31_ident"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 85 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"xpos": 740,
"ypos": 12,
"width": 148,
"height": 19,
"type": "match"
}
],
"properties": [],
"tags": [
"version_rawhide_ident"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 82 KiB

View File

@ -44,7 +44,11 @@ sub _set_root_password {
my $identification = get_var('IDENTIFICATION'); my $identification = get_var('IDENTIFICATION');
if ($identification eq 'true') { if ($identification eq 'true') {
check_top_bar(); check_top_bar();
check_prerelease(); # we don't check version or pre-release because here those
# texts appear on the banner which makes the needling
# complex and fragile (banner is different between variants,
# and has a gradient so for RTL languages the background color
# differs; pre-release text is also translated)
} }
assert_and_click "anaconda_spoke_done"; assert_and_click "anaconda_spoke_done";
} }

View File

@ -21,16 +21,12 @@ sub run {
# Here the self identification test code is placed. # Here the self identification test code is placed.
my $branched = get_var('VERSION'); my $branched = get_var('VERSION');
if ($identification eq 'true' or $branched ne "Rawhide") { if ($identification eq 'true' or $branched ne "Rawhide") {
check_top_bar(); # See utils.pm check_top_bar(); # See utils.pm
# disabled because we have issues with false needle matches # we don't check version or pre-release because here those
# on the pre-release note when it's dark red text on a dark # texts appear on the banner which makes the needling
# blue background - os-autoinst greyscales images before # complex and fragile (banner is different between variants,
# comparing, and they wind up the same shade of grey, so we # and has a gradient so for RTL languages the background color
# will get a 'match' for the pre-release needle even if the # differs; pre-release text is also translated)
# text is not there at all:
# https://progress.opensuse.org/issues/56822
# check_prerelease();
check_version();
} }
assert_and_click "anaconda_spoke_done"; assert_and_click "anaconda_spoke_done";