From eff99e95b6ccaf96be5ee66b743cbcfafa957943 Mon Sep 17 00:00:00 2001 From: vijaysawant Date: Thu, 21 Sep 2023 14:23:19 +0530 Subject: [PATCH] [6.12.z] leapp cherypick failure fix & component name updated --- testimony.yaml | 2 +- tests/foreman/cli/test_leapp_client.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/testimony.yaml b/testimony.yaml index a43d54b7f16..9e1e2bca39e 100644 --- a/testimony.yaml +++ b/testimony.yaml @@ -67,7 +67,7 @@ CaseComponent: - katello-agent - katello-tracer - LDAP - - LeappIntegration + - Leappintegration - LifecycleEnvironments - LocalizationInternationalization - Logging diff --git a/tests/foreman/cli/test_leapp_client.py b/tests/foreman/cli/test_leapp_client.py index 77e4a7e0486..4e8b7d4fb6e 100644 --- a/tests/foreman/cli/test_leapp_client.py +++ b/tests/foreman/cli/test_leapp_client.py @@ -4,7 +4,7 @@ :CaseLevel: Integration -:CaseComponent: LeappIntegration +:CaseComponent: Leappintegration :Team: Rocket @@ -176,7 +176,9 @@ def verify_target_repo_on_satellite( @pytest.fixture -def custom_leapp_host(upgrade_path, module_target_sat, module_sca_manifest_org, function_leapp_ak): +def custom_leapp_host( + upgrade_path, module_target_sat, module_sca_manifest_org, module_location, function_leapp_ak +): """Checkout content host and register with satellite""" deploy_args = {} deploy_args['deploy_rhel_version'] = upgrade_path['source_version'] @@ -187,7 +189,7 @@ def custom_leapp_host(upgrade_path, module_target_sat, module_sca_manifest_org, deploy_flavor=settings.flavors.default, ) as chost: result = chost.register( - module_sca_manifest_org, None, function_leapp_ak.name, module_target_sat + module_sca_manifest_org, module_location, function_leapp_ak.name, module_target_sat ) assert result.status == 0, f'Failed to register host: {result.stderr}' yield chost