Fixes for server_cockpit_updates@64bit on rocky-8.4-dvd-iso-x86_64 (#47)

* add needles for Rocky cockpit_updates test suite
* modify server_cockpit_updates test for Rocky
* remove bad needle for cockpit_autoupdates
* add needles for Rocky server_cockpit_updates test suite
This commit is contained in:
Trevor Cooper 2021-09-29 19:16:17 -07:00 committed by GitHub
parent be579e5c60
commit ddd5bf5f6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
38 changed files with 354 additions and 13 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

View File

@ -1,11 +1,11 @@
{ {
"area": [ "area": [
{ {
"ypos": 341, "xpos": 429,
"width": 71, "ypos": 462,
"xpos": 546, "width": 73,
"type": "match", "height": 21,
"height": 19 "type": "match"
} }
], ],
"properties": [], "properties": [],

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 520,
"ypos": 460,
"width": 40,
"height": 21,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"autoupdate_planned_time"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"ypos": 694,
"width": 43,
"height": 55,
"xpos": 196,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_leftbar_scroll"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"ypos": 604,
"width": 213,
"height": 27,
"xpos": 262,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_main"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 71 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"type": "match",
"xpos": 398,
"height": 17,
"width": 100,
"ypos": 543
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_save_changes"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"type": "match",
"height": 17,
"xpos": 398,
"ypos": 543,
"width": 100
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_save_changes"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"type": "match",
"xpos": 84,
"height": 22,
"ypos": 690,
"width": 62
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_software_updates"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 75 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"ypos": 388,
"width": 65,
"height": 18,
"xpos": 835,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_updates_all_install"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

View File

@ -0,0 +1,20 @@
{
"area": [
{
"height": 21,
"width": 37,
"ypos": 413,
"type": "match",
"xpos": 927,
"click_point": {
"xpos": 18.5,
"ypos": 10.5
}
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_updates_auto"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

View File

@ -0,0 +1,20 @@
{
"area": [
{
"ypos": 287,
"width": 43,
"height": 19,
"xpos": 535,
"type": "match",
"click_point": {
"xpos": 11.5,
"ypos": 8.5
}
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_updates_auto_all"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"type": "match",
"xpos": 941,
"height": 20,
"width": 22,
"ypos": 198
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_updates_check"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

View File

@ -0,0 +1,20 @@
{
"area": [
{
"ypos": 302,
"width": 49,
"height": 17,
"xpos": 271,
"type": "match",
"click_point": {
"xpos": 24.5,
"ypos": 8.5
}
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_updates_dnf_install"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"height": 17,
"xpos": 271,
"type": "match",
"ypos": 302,
"width": 49
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_updates_dnf_install"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

View File

@ -0,0 +1,20 @@
{
"area": [
{
"type": "match",
"xpos": 759,
"height": 24,
"ypos": 442,
"width": 57,
"click_point": {
"xpos": 28.5,
"ypos": 12
}
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_updates_restart_ignore"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

View File

@ -0,0 +1,27 @@
{
"area": [
{
"xpos": 307,
"ypos": 636,
"width": 297,
"height": 23,
"type": "match"
},
{
"xpos": 985,
"ypos": 173,
"width": 37,
"height": 66,
"type": "match",
"click_point": {
"xpos": 31.5,
"ypos": 50
}
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_updates_security_complete"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

View File

@ -0,0 +1,20 @@
{
"area": [
{
"xpos": 632,
"type": "match",
"width": 178,
"ypos": 554,
"height": 20,
"click_point": {
"xpos": 90,
"ypos": 11
}
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_updates_security_install"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 639,
"type": "match",
"width": 172,
"ypos": 221,
"height": 30
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_updates_updated"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"height": 19,
"ypos": 322,
"width": 56,
"type": "match",
"xpos": 279
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_updates_updated"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

View File

@ -26,20 +26,51 @@ sub run {
# After updates, ignore restart because we do not need # After updates, ignore restart because we do not need
# restarting the machine to continue. Also, we would have # restarting the machine to continue. Also, we would have
# to deal with much more complicated workflow. # to deal with much more complicated workflow.
#
if (check_screen('cockpit_updates_security_install',1)) { # In Rocky it may take quite a while to query for updates
# and present the Install Security Updates button.
# Provide a bit of extra time to match that screen
if (check_screen('cockpit_updates_security_install', 180)) {
# There may be a large number of security updates to install
# so give the system more time to complete those updates.
assert_and_click 'cockpit_updates_security_install'; assert_and_click 'cockpit_updates_security_install';
sleep 60; # wait until things are installed my $run = 0;
while ($run < 60) {
# Ignore rebooting the system because we want to finish the test instead.
if (check_screen('cockpit_updates_restart_ignore', 1)) {
assert_and_click 'cockpit_updates_restart_ignore'; assert_and_click 'cockpit_updates_restart_ignore';
wait_still_screen 2; last;
}
else {
sleep 60;
$run = $run + 1;
} }
# move the mouse a bit
mouse_set 100, 100;
# also click, if we're a VNC client, seems just moving mouse
# isn't enough to defeat blanking
mouse_click if (get_var("VNC_CLIENT"));
mouse_hide;
}
wait_still_screen 2;
# Rocky cockpit UI may require a scroll-down event after
# updating.
if (check_screen('cockpit_updates_security_complete', 180)) {
assert_screen ["cockpit_updates_security_complete"], 120;
click_lastmatch;
}
}
# Install the rest of the updates, or any updates # Install the rest of the updates, or any updates
# that have not been previously installed. # that have not been previously installed.
assert_and_click 'cockpit_updates_all_install'; assert_and_click 'cockpit_updates_all_install';
my $run = 0; my $run = 0;
while ($run < 40) { while ($run < 60) {
# When Cockpit packages are also included in the updates # When Cockpit packages are also included in the updates
# the user is forced to reconnect, i.e. to restart the Web Application # the user is forced to reconnect, i.e. to restart the Web Application
# and relog for further interaction. We will check if reconnection is # and relog for further interaction. We will check if reconnection is
@ -63,6 +94,13 @@ sub run {
sleep 10; sleep 10;
$run = $run + 1; $run = $run + 1;
} }
# move the mouse a bit
mouse_set 100, 100;
# also click, if we're a VNC client, seems just moving mouse
# isn't enough to defeat blanking
mouse_click if (get_var("VNC_CLIENT"));
mouse_hide;
} }
# Check that the system is updated # Check that the system is updated
assert_screen 'cockpit_updates_updated'; assert_screen 'cockpit_updates_updated';