Add needles and code to complete anaconda_help test suite (#76)

* remove conflicting/incorrect needles

* mods for ananonda_help test suite
- support Rocky help content in anaconda.pm

* workaround software_selection failure

* add needles for anaconda_help
This commit is contained in:
Trevor Cooper 2022-02-03 16:25:03 -08:00 committed by GitHub
parent 316e7d2c7a
commit 049f5f4ba2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
59 changed files with 405 additions and 27 deletions

View File

@ -411,6 +411,19 @@ sub check_help_on_pane {
} }
# Otherwise, only check the relevant screen. # Otherwise, only check the relevant screen.
else { else {
# Rocky help has a level of indirection here. Need to click a link first...
if ((get_var('DISTRI') eq "rocky"))
{
if ($screen eq "keyboard_layout" || $screen eq "language_support" || $screen eq "time_date")
{
assert_and_click "anaconda_help_localization_link";
# Specifically for language_support and time_date press page-down
if ($screen eq "language_support" || $screen eq "time_date")
{
send_key "spc";
}
}
}
assert_screen "anaconda_help_$screen"; assert_screen "anaconda_help_$screen";
} }
# Close Help window # Close Help window

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 247,
"ypos": 554,
"width": 35,
"height": 30,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_main_hub_create_user"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 724,
"ypos": 202,
"width": 32,
"height": 30,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_main_hub_install_destination"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 486,
"ypos": 202,
"width": 30,
"height": 30,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_main_hub_install_source"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 245,
"ypos": 202,
"width": 37,
"height": 29,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_main_hub_keyboard_layout"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 247,
"ypos": 272,
"width": 34,
"height": 30,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_main_hub_language_support"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 722,
"ypos": 342,
"width": 33,
"height": 29,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_main_hub_network_host_name"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 245,
"ypos": 484,
"width": 36,
"height": 33,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_main_hub_root_password"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 485,
"ypos": 274,
"width": 33,
"height": 31,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_main_hub_software_selection"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 244,
"ypos": 341,
"width": 36,
"height": 31,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_main_hub_time_date"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 41,
"ypos": 220,
"width": 384,
"height": 35,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_help_create_user"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 67 KiB

View File

@ -1,11 +1,11 @@
{ {
"area": [ "area": [
{ {
"width": 313, "xpos": 41,
"type": "match", "ypos": 217,
"xpos": 547, "width": 499,
"ypos": 132, "height": 38,
"height": 38 "type": "match"
} }
], ],
"properties": [], "properties": [],

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 41,
"ypos": 220,
"width": 446,
"height": 34,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_help_install_destination"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 40,
"ypos": 216,
"width": 436,
"height": 40,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_help_installation_progress"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 39,
"ypos": 217,
"width": 490,
"height": 39,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_help_installation_source"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 70 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 40,
"ypos": 217,
"width": 340,
"height": 39,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_help_keyboard_layout"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 79 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 39,
"ypos": 250,
"width": 312,
"height": 21,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_help_language_support"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 70 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 53,
"ypos": 396,
"width": 400,
"height": 20,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_help_localization_link"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 40,
"ypos": 219,
"width": 700,
"height": 34,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_help_network_host_name"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 42,
"ypos": 218,
"width": 676,
"height": 36,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_help_progress"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 54,
"ypos": 242,
"width": 284,
"height": 17,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_help_progress_link"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

View File

@ -1,11 +1,11 @@
{ {
"area": [ "area": [
{ {
"width": 51, "xpos": 965,
"type": "match", "ypos": 76,
"xpos": 782, "width": 18,
"ypos": 15, "height": 24,
"height": 15 "type": "match"
} }
], ],
"properties": [], "properties": [],

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 40,
"ypos": 219,
"width": 454,
"height": 35,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_help_root_password"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 39,
"ypos": 219,
"width": 488,
"height": 36,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_help_select_packages"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

View File

@ -1,11 +1,11 @@
{ {
"area": [ "area": [
{ {
"width": 342, "xpos": 41,
"type": "match", "ypos": 195,
"xpos": 674, "width": 457,
"ypos": 700, "height": 32,
"height": 35 "type": "match"
} }
], ],
"properties": [], "properties": [],

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 40,
"ypos": 421,
"width": 350,
"height": 20,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_help_time_date"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

View File

@ -1,11 +1,11 @@
{ {
"area": [ "area": [
{ {
"width": 107, "xpos": 884,
"ypos": 708, "ypos": 705,
"xpos": 912, "width": 128,
"type": "match", "height": 24,
"height": 17 "type": "match"
} }
], ],
"properties": [], "properties": [],

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

View File

@ -12,7 +12,7 @@ sub run {
my $packageset = get_var('PACKAGE_SET', 'minimal'); my $packageset = get_var('PACKAGE_SET', 'minimal');
if ($packageset eq 'default' || get_var('MODULAR')) { if ($packageset eq 'default' || get_var('MODULAR')) {
# we can't or don't want to check the selected package set in these cases # we can't or don't want to check the selected package set in these cases
return if (get_var('CANNED') || get_var('LIVE') || get_var('MEMCHECK')); return if (get_var('CANNED') || get_var('LIVE') || get_var('MEMCHECK') || (get_var('DISTRI') eq 'Rocky'));
$self->root_console; $self->root_console;
my $env = 'custom-environment'; my $env = 'custom-environment';
if (get_var('SUBVARIANT') eq 'Server') { if (get_var('SUBVARIANT') eq 'Server') {

View File

@ -24,8 +24,14 @@ sub run {
# Create test plans # Create test plans
my @testplan; my @testplan;
# For Rocky ISO
if ((get_var('DISTRI') eq "Rocky")) {
@testplan = qw/keyboard_layout language_support time_date installation_source select_packages install_destination network_host_name root_password create_user/;
}
# While technically we don't need any of these Fedora test plans it's worth
# leaving them here for now as examples.
# For LIVE KDE: # For LIVE KDE:
if ((get_var('LIVE')) && (get_var('DESKTOP') eq "kde")) { elsif ((get_var('LIVE')) && (get_var('DESKTOP') eq "kde")) {
@testplan = qw/keyboard_layout time_date install_destination network_host_name root_password create_user/; @testplan = qw/keyboard_layout time_date install_destination network_host_name root_password create_user/;
} }
# For LIVE Workstation # For LIVE Workstation
@ -51,6 +57,11 @@ sub run {
# need to set a root password or create a user; on other flavors # need to set a root password or create a user; on other flavors
# we must # we must
unless (get_var("DESKTOP") eq "gnome" ) { unless (get_var("DESKTOP") eq "gnome" ) {
# In Rocky ISO you will finish testplan on Create User and need to shift-tab to select
# Root password
if ((get_var("DISTRI") eq "rocky" )) {
send_key_until_needlematch("anaconda_main_hub_root_password", "shift-tab");
}
assert_and_click "anaconda_main_hub_root_password"; assert_and_click "anaconda_main_hub_root_password";
type_safely "weakrootpassword"; type_safely "weakrootpassword";
send_key "tab"; send_key "tab";
@ -62,7 +73,9 @@ sub run {
wait_screen_change { assert_and_click "anaconda_main_hub_begin_installation"; }; wait_screen_change { assert_and_click "anaconda_main_hub_begin_installation"; };
# Check the last Help screen # Check the last Help screen
check_help_on_pane("installation_progress"); unless (get_var("DISTRI") eq "rocky") {
check_help_on_pane("installation_progress");
}
# As there is no need to proceed with the installation, # As there is no need to proceed with the installation,
# the test ends here and the VM will be destroyed # the test ends here and the VM will be destroyed