Check for 3rd-party popup instead of 'welcome' screen

GNOME Software no longer has a welcome screen in any current
Fedora (it was dropped between 35 and 36), but in Rawhide it now
has a popup that prompts you to enable third-party repos which
we need to get rid of, so just convert the welcome screen check
to handle that, and drop all the welcome screen needles.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2023-01-09 10:34:27 -08:00
parent d4cb357db7
commit 2db1e57674
11 changed files with 20 additions and 68 deletions

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 385,
"ypos": 502,
"width": 51,
"height": 20,
"type": "match"
}
],
"properties": [],
"tags": [
"DESKTOP-gnome",
"gnome_software_ignore"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"height": 15,
"ypos": 561,
"xpos": 458,
"width": 111,
"type": "match"
}
],
"properties": [],
"tags": [
"DESKTOP-gnome",
"gnome_software_welcome"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 176 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"type": "match",
"height": 15,
"ypos": 533,
"width": 116,
"xpos": 454
}
],
"properties": [],
"tags": [
"DESKTOP-gnome",
"gnome_software_welcome"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 64 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"width": 62,
"type": "match",
"height": 18,
"ypos": 558,
"xpos": 509
}
],
"tags": [
"DESKTOP-gnome",
"gnome_software_welcome"
],
"properties": []
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 112 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"height": 18,
"width": 62,
"type": "match",
"ypos": 484,
"xpos": 521
}
],
"properties": [],
"tags": [
"DESKTOP-gnome",
"gnome_software_welcome"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 137 KiB

View File

@ -37,10 +37,10 @@ sub run {
sleep 3;
menu_launch_type('update');
}
# GNOME Software has a welcome screen, get rid of it if it shows
# up (but don't fail if it doesn't, we're not testing that)
if ($desktop eq 'gnome' && check_screen 'gnome_software_welcome', 10) {
send_key 'ret';
# GNOME Software 44+ has a 3rd party source pop-up, get rid of it
# if it shows up (but don't fail if it doesn't, we're not testing that)
if ($desktop eq 'gnome' && check_screen 'gnome_software_ignore', 10) {
click_lastmatch;
}
# go to the 'update' interface. We may be waiting some time at a
# 'Software catalog is being loaded' screen.