Skip to content

Commit

Permalink
Fix errata upgrade scenario tests
Browse files Browse the repository at this point in the history
  • Loading branch information
vsedmik committed Dec 16, 2024
1 parent ea1716d commit 889a6dd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion robottelo/host_helpers/satellite_mixins.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from robottelo.host_helpers.cli_factory import CLIFactory
from robottelo.host_helpers.ui_factory import UIFactory
from robottelo.logging import logger
from robottelo.utils.datafactory import gen_string
from robottelo.utils.installer import InstallerCommand
from robottelo.utils.manifest import clone

Expand Down Expand Up @@ -184,7 +185,7 @@ def is_sca_mode_enabled(self, org_id):
"""
return self.api.Organization(id=org_id).read().simple_content_access

def publish_content_view(self, org, repo_list, name):
def publish_content_view(self, org, repo_list, name=None):
"""This method publishes the content view for a given organization and repository list.
:param str org: The name of the organization to which the content view belongs
Expand All @@ -193,6 +194,7 @@ def publish_content_view(self, org, repo_list, name):
:return: A dictionary containing the details of the published content view.
"""
repo = repo_list if isinstance(repo_list, list) else [repo_list]
name = name or gen_string('alpha')
content_view = self.api.ContentView(organization=org, repository=repo, name=name).create()
content_view.publish()
return content_view.read()
Expand Down
4 changes: 3 additions & 1 deletion tests/upgrades/test_errata.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,9 @@ def test_pre_scenario_generate_errata_for_client(
}
)

@pytest.mark.parametrize('pre_upgrade_data', ['rhel7', 'rhel8', 'rhel9'], indirect=True)
@pytest.mark.parametrize(
'pre_upgrade_data', ['rhel7-ipv4', 'rhel8-ipv4', 'rhel9-ipv4'], indirect=True
)
@pytest.mark.post_upgrade(depend_on=test_pre_scenario_generate_errata_for_client)
def test_post_scenario_errata_count_installation(self, target_sat, pre_upgrade_data):
"""Post-upgrade scenario that applies errata on the RHEL client that was set up
Expand Down

0 comments on commit 889a6dd

Please sign in to comment.