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

lib/anaconda.pm

@@ -411,6 +411,19 @@ sub check_help_on_pane {
     }
     # Otherwise, only check the relevant screen.
     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";
     }
     # Close Help window

needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_create_user-20220203.json

@@ -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"
+  ]
+}

needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_destination-20220203.json

@@ -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"
+  ]
+}

needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_source-20220203.json

@@ -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"
+  ]
+}

needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_keyboard_layout-20220203.json

@@ -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"
+  ]
+}

needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_language_support-20220203.json

@@ -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"
+  ]
+}

needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_network_host_name-20220203.json

@@ -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"
+  ]
+}

needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_root_password-20220203.json

@@ -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"
+  ]
+}

needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_software_selection-20220203.json

@@ -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"
+  ]
+}

needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_time_date-20220203.json

@@ -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"
+  ]
+}

needles/anaconda/help/rocky-anaconda_help_create_user-20220203.json

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

needles/anaconda/help/rocky-anaconda_help_help_language_selection-20220202.json

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

needles/anaconda/help/rocky-anaconda_help_install_destination-20220203.json

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

needles/anaconda/help/rocky-anaconda_help_installation_progress-20220203.json

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

needles/anaconda/help/rocky-anaconda_help_installation_source-20220203.json

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

needles/anaconda/help/rocky-anaconda_help_keyboard_layout-20220203.json

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

needles/anaconda/help/rocky-anaconda_help_language_support-20220203.json

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

needles/anaconda/help/rocky-anaconda_help_localization_link-20220203.json

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

needles/anaconda/help/rocky-anaconda_help_network_host_name-20220203.json

@@ -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"
+  ]
+}

needles/anaconda/help/rocky-anaconda_help_progress-20220203.json

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

needles/anaconda/help/rocky-anaconda_help_progress_link-20220203.json

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

needles/anaconda/help/rocky-anaconda_help_quit-20220202.json

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

needles/anaconda/help/rocky-anaconda_help_root_password-20220203.json

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

needles/anaconda/help/rocky-anaconda_help_select_packages-20220203.json

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

needles/anaconda/help/rocky-anaconda_help_summary-20220203.json

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

needles/anaconda/help/rocky-anaconda_help_time_date-20220203.json

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

needles/anaconda/main_hub/rocky-anaconda_main_hub_begin_installation-20220203.json

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

tests/_software_selection.pm

@@ -12,7 +12,7 @@ sub run {
     my $packageset = get_var('PACKAGE_SET', 'minimal');
     if ($packageset eq 'default' || get_var('MODULAR')) {
         # 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;
         my $env = 'custom-environment';
         if (get_var('SUBVARIANT') eq 'Server') {

tests/anaconda_help.pm

@@ -24,8 +24,14 @@ sub run {
 
     # Create test plans
     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:
-    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/;
     }
     # For LIVE Workstation
@@ -51,6 +57,11 @@ sub run {
     # need to set a root password or create a user; on other flavors
     # we must
     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";
         type_safely "weakrootpassword";
         send_key "tab";
@@ -62,7 +73,9 @@ sub run {
     wait_screen_change { assert_and_click "anaconda_main_hub_begin_installation"; };
 
     # 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,
     # the test ends here and the VM will be destroyed