Address suggestions

Signed-off-by: Dominik Gedon <dominik.gedon@suse.com>
uyuni-project · Aug 29, 2023 · 728e82e · 728e82e
1 parent f7ba7bb
commit 728e82e
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/testsuite/features/build_validation/add_non_MU_repositories/alma9_minion_build_clm.feature b/testsuite/features/build_validation/add_non_MU_repositories/alma9_minion_build_clm.feature
@@ -57,7 +57,7 @@ Feature: Add the Alma 9 distribution custom repositories
     When I click on "Attach/Detach Sources"
     And I wait until I do not see "Loading" text
     And I select "AlmaLinux 9 (x86_64)" from "selectedBaseChannel"
-    And I check "Uyuni Client Tools for AlmaLinux 9 (x86_64) (Development)"
+    And I check "Uyuni Client Tools for AlmaLinux 9 (x86_64)"
     And I check "Custom Channel for alma9_minion"
     And I check "AlmaLinux 9 AppStream (x86_64)"
     And I click on "Save"

diff --git a/testsuite/features/build_validation/add_non_MU_repositories/oracle9_minion_build_clm.feature b/testsuite/features/build_validation/add_non_MU_repositories/oracle9_minion_build_clm.feature
@@ -58,7 +58,7 @@ Feature: Add the Oracle 9 distribution custom repositories
     When I click on "Attach/Detach Sources"
     And I wait until I do not see "Loading" text
     And I select "Oracle Linux 9 (x86_64)" from "selectedBaseChannel"
-    And I check "Uyuni Client Tools for Oracle Linux 9 (x86_64) (Development)"
+    And I check "Uyuni Client Tools for Oracle Linux 9 (x86_64)"
     And I check "Oracle Linux 9 AppStream (x86_64)"
     And I check "Custom Channel for oracle9_minion"
     And I click on "Save"

diff --git a/...ures/build_validation/add_non_MU_repositories/rocky8_minion_add_iso_and_build_clm.feature b/...ures/build_validation/add_non_MU_repositories/rocky8_minion_add_iso_and_build_clm.feature
@@ -121,7 +121,7 @@ Feature: Add the Rocky 8 distribution custom repositories
     When I click on "Attach/Detach Sources"
     And I wait until I do not see "Loading" text
     And I select "Rocky Linux 8 (x86_64)" from "selectedBaseChannel"
-    And I check "Uyuni Client Tools for Rocky Linux 8 (x86_64) (Development)"
+    And I check "Uyuni Client Tools for Rocky Linux 8 (x86_64)"
     And I check "Rocky Linux 8 - AppStream (x86_64)"
     And I check "Custom Channel for Rocky 8 DVD"
     And I check "Custom Channel for rocky8_minion"

diff --git a/testsuite/features/build_validation/add_non_MU_repositories/rocky9_minion_build_clm.feature b/testsuite/features/build_validation/add_non_MU_repositories/rocky9_minion_build_clm.feature
@@ -57,7 +57,7 @@ Feature: Add the Rocky 9 distribution custom repositories
     When I click on "Attach/Detach Sources"
     And I wait until I do not see "Loading" text
     And I select "Rocky Linux 9 (x86_64)" from "selectedBaseChannel"
-    And I check "Uyuni Client Tools for Rocky Linux 9 (x86_64) (Development)"
+    And I check "Uyuni Client Tools for Rocky Linux 9 (x86_64)"
     And I check "Rocky Linux 9 AppStream (x86_64)"
     And I check "Custom Channel for rocky9_minion"
     And I click on "Save"

diff --git a/testsuite/features/init_clients/allcli_update_activationkeys.feature b/testsuite/features/init_clients/allcli_update_activationkeys.feature
@@ -185,6 +185,6 @@ Feature: Update activation keys
     And I check "Update repository of openSUSE Leap 15.4 Backports (x86_64)"
     And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.4 (x86_64)"
     And I check "Uyuni Client Tools for openSUSE Leap 15.4 (x86_64)"
-    And I check "Uyuni Proxy Devel for openSUSE Leap 15.4 (x86_64) (Development)"
+    And I check "Uyuni Proxy Devel for openSUSE Leap 15.4 (x86_64)"
     When I click on "Update Activation Key"
     Then I should see a "Activation key Proxy Key x86_64 has been modified" text
diff --git a/testsuite/features/init_clients/proxy_register_as_minion_with_gui.feature b/testsuite/features/init_clients/proxy_register_as_minion_with_gui.feature
@@ -78,7 +78,7 @@ Feature: Setup Uyuni proxy
     And I check "Update repository of openSUSE Leap 15.4 Backports (x86_64)"
     And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.4 (x86_64)"
     And I check "Uyuni Client Tools for openSUSE Leap 15.4 (x86_64)"
-    And I check "Uyuni Proxy Devel for openSUSE Leap 15.4 (x86_64) (Development)"
+    And I check "Uyuni Proxy Devel for openSUSE Leap 15.4 (x86_64)"
     And I click on "Next"
     Then I should see a "Confirm Software Channel Change" text
     When I click on "Confirm"

diff --git a/testsuite/features/init_clients/proxy_register_as_minion_with_script.feature b/testsuite/features/init_clients/proxy_register_as_minion_with_script.feature
@@ -88,7 +88,7 @@ Feature: Setup Uyuni proxy
     And I check "Update repository of openSUSE Leap 15.4 Backports (x86_64)"
     And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.4 (x86_64)"
     And I check "Uyuni Client Tools for openSUSE Leap 15.4 (x86_64)"
-    And I check "Uyuni Proxy Devel for openSUSE Leap 15.4 (x86_64) (Development)"
+    And I check "Uyuni Proxy Devel for openSUSE Leap 15.4 (x86_64)"
     And I click on "Next"
     Then I should see a "Confirm Software Channel Change" text
     When I click on "Confirm"

diff --git a/testsuite/features/step_definitions/api_common.rb b/testsuite/features/step_definitions/api_common.rb
@@ -238,19 +238,19 @@
 When(/^I create an activation key including custom channels for "([^"]*)" via API$/) do |client|
   # Create a key with the base channel for this client
   id = description = "#{client}_key"
-  base_channel_map = BASE_CHANNEL_BY_CLIENT[product][client]
-  base_channel = LABEL_BY_BASE_CHANNEL[product][base_channel_map]
-  key = $api_test.activationkey.create(id, description, base_channel, 100)
+  base_channel = BASE_CHANNEL_BY_CLIENT[product][client]
+  base_channel_label = LABEL_BY_BASE_CHANNEL[product][base_channel]
+  key = $api_test.activationkey.create(id, description, base_channel_label, 100)
   raise StandardError, 'Error creating activation key via the API' if key.nil?
   STDOUT.puts "Activation key #{key} created" unless key.nil?
 
   is_ssh_minion = client.include? 'ssh_minion'
-  $api_test.activationkey.set_details(key, description, base_channel, 100, is_ssh_minion ? 'ssh-push' : 'default')
+  $api_test.activationkey.set_details(key, description, base_channel_label, 100, is_ssh_minion ? 'ssh-push' : 'default')
   entitlements = client.include?('buildhost') ? ['osimage_build_host'] : ''
   $api_test.activationkey.set_entitlement(key, entitlements) unless entitlements.empty?
 
   # Get the list of child channels for this base channel
-  child_channels = $api_test.channel.software.list_child_channels(base_channel)
+  child_channels = $api_test.channel.software.list_child_channels(base_channel_label)
 
   # Filter out the custom channels
   # This is needed because we might have both a traditional custom channel and a Salt custom channel