targetuserspacegen: fix tests constructing RHUIInfo

oamg · Apr 9, 2023 · 854c24d · 854c24d
1 parent 72f5ac4
commit 854c24d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py b/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py
@@ -795,7 +795,7 @@ def install_target_rhui_client_if_needed(context, indata):
     # @Todo: We might need to handle GPG stuff here in order to install the client
     cmd = ['dnf', '-y']
 
-    if setup_info.enable_only_repoids_in_copied_files:
+    if setup_info.enable_only_repoids_in_copied_files and setup_info.preinstall_tasks:
         copy_tasks = setup_info.preinstall_tasks.files_to_copy_in
         copied_repofiles = [copy.src for copy in copy_tasks if copy.src.endswith('.repo')]
         copied_repoids = set()

diff --git a/...em_upgrade/common/actors/targetuserspacecreator/tests/unit_test_targetuserspacecreator.py b/...em_upgrade/common/actors/targetuserspacecreator/tests/unit_test_targetuserspacecreator.py
@@ -85,7 +85,10 @@ def _gen_packages_msgs():
 
 _PACKAGES_MSGS = _gen_packages_msgs()
 _RHSMINFO_MSG = models.RHSMInfo(attached_skus=['testing-sku'])
-_RHUIINFO_MSG = models.RHUIInfo(provider='aws')
+_RHUIINFO_MSG = models.RHUIInfo(provider='aws',
+                                src_client_pkg_names=['rh-amazon-rhui-client'],
+                                target_client_pkg_names=['rh-amazon-rhui-client'],
+                                target_client_setup_info=models.RHUIClientSetupInfo())
 _XFS_MSG = models.XFSPresence()
 _STORAGEINFO_MSG = models.StorageInfo()
 _CTRF_MSGS = [