diff --git a/needles/cockpit/cockpit_updates_restart_ignore-20191129.json b/needles/cockpit/cockpit_updates_restart_ignore-20191129.json deleted file mode 100644 index 51b5adcf..00000000 --- a/needles/cockpit/cockpit_updates_restart_ignore-20191129.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "area": [ - { - "type": "match", - "height": 19, - "xpos": 543, - "ypos": 340, - "width": 51 - } - ], - "properties": [], - "tags": [ - "cockpit_updates_restart_ignore" - ] -} \ No newline at end of file diff --git a/needles/cockpit/cockpit_updates_restart_ignore-20191129.png b/needles/cockpit/cockpit_updates_restart_ignore-20191129.png deleted file mode 100644 index 403cbdc0..00000000 Binary files a/needles/cockpit/cockpit_updates_restart_ignore-20191129.png and /dev/null differ diff --git a/needles/cockpit/cockpit_updates_restart_ignore-oldcantarell-20200124.json b/needles/cockpit/cockpit_updates_restart_ignore-20230428.json similarity index 76% rename from needles/cockpit/cockpit_updates_restart_ignore-oldcantarell-20200124.json rename to needles/cockpit/cockpit_updates_restart_ignore-20230428.json index bad05f57..acdce514 100644 --- a/needles/cockpit/cockpit_updates_restart_ignore-oldcantarell-20200124.json +++ b/needles/cockpit/cockpit_updates_restart_ignore-20230428.json @@ -1,11 +1,11 @@ { "area": [ { + "width": 51, + "ypos": 441, "height": 19, "type": "match", - "ypos": 301, - "width": 51, - "xpos": 562 + "xpos": 675 } ], "properties": [], diff --git a/needles/cockpit/cockpit_updates_restart_ignore-20230428.png b/needles/cockpit/cockpit_updates_restart_ignore-20230428.png new file mode 100644 index 00000000..5ba72992 Binary files /dev/null and b/needles/cockpit/cockpit_updates_restart_ignore-20230428.png differ diff --git a/needles/cockpit/cockpit_updates_restart_ignore-oldcantarell-20200124.png b/needles/cockpit/cockpit_updates_restart_ignore-oldcantarell-20200124.png deleted file mode 100644 index 17e9e201..00000000 Binary files a/needles/cockpit/cockpit_updates_restart_ignore-oldcantarell-20200124.png and /dev/null differ diff --git a/needles/cockpit/cockpit_updates_security_install.json b/needles/cockpit/cockpit_updates_security_install.json deleted file mode 100644 index c215f0ad..00000000 --- a/needles/cockpit/cockpit_updates_security_install.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "properties": [], - "tags": [ - "cockpit_updates_security_install" - ], - "area": [ - { - "xpos": 619, - "ypos": 267, - "width": 93, - "height": 16, - "type": "match" - } - ] -} \ No newline at end of file diff --git a/needles/cockpit/cockpit_updates_security_install.png b/needles/cockpit/cockpit_updates_security_install.png deleted file mode 100644 index c7600fa9..00000000 Binary files a/needles/cockpit/cockpit_updates_security_install.png and /dev/null differ diff --git a/tests/server_cockpit_updates.pm b/tests/server_cockpit_updates.pm index d29cf7b4..a7f76a12 100644 --- a/tests/server_cockpit_updates.pm +++ b/tests/server_cockpit_updates.pm @@ -21,20 +21,6 @@ sub run { select_cockpit_update(); - # If security updates are available, install them first, - # so that we test the most buttons in one go. - # After updates, ignore restart because we do not need - # restarting the machine to continue. Also, we would have - # to deal with much more complicated workflow. - # - if (check_screen('cockpit_updates_security_install', 1)) { - assert_and_click 'cockpit_updates_security_install'; - sleep 60; # wait until things are installed - assert_and_click 'cockpit_updates_restart_ignore'; - wait_still_screen 2; - } - - # Install the rest of the updates, or any updates # that have not been previously installed. assert_and_click 'cockpit_updates_all_install';