Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SAT-23362-update-fixture-as-per-new-feature(6.16) #14673

Merged
merged 2 commits into from
Apr 10, 2024
Merged

SAT-23362-update-fixture-as-per-new-feature(6.16) #14673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad18bcb
SAT-23362-update-fixture-as-per-new-feature(6.16)
vijaysawant Apr 8, 2024
75cd151
fix fixture name and reposet name from constants
vijaysawant Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions robottelo/constants/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,9 +311,9 @@ class Colored(Box):
'kickstart': {
'rhel6': 'Red Hat Enterprise Linux 6 Server (Kickstart)',
'rhel7': 'Red Hat Enterprise Linux 7 Server (Kickstart)',
'rhel8': 'Red Hat Enterprise Linux 8 for x86_64 - BaseOS (Kickstart)',
'rhel8_bos': 'Red Hat Enterprise Linux 8 for x86_64 - BaseOS (Kickstart)',
'rhel8_aps': 'Red Hat Enterprise Linux 8 for x86_64 - AppStream (Kickstart)',
'rhel9': 'Red Hat Enterprise Linux 9 for x86_64 - BaseOS (Kickstart)',
'rhel9_bos': 'Red Hat Enterprise Linux 9 for x86_64 - BaseOS (Kickstart)',
'rhel9_aps': 'Red Hat Enterprise Linux 9 for x86_64 - AppStream (Kickstart)',
},
'rhel8_bos': 'Red Hat Enterprise Linux 8 for x86_64 - BaseOS (RPMs)',
Expand Down Expand Up @@ -538,7 +538,7 @@ class Colored(Box):
'id': 'rhel-8-for-x86_64-baseos-kickstart',
'name': 'Red Hat Enterprise Linux 8 for x86_64 - BaseOS Kickstart 8.9',
'version': '8.9',
'reposet': REPOSET['kickstart']['rhel8'],
'reposet': REPOSET['kickstart']['rhel8_bos'],
'product': PRDS['rhel8'],
'distro': 'rhel8',
},
Expand All @@ -554,7 +554,7 @@ class Colored(Box):
'id': 'rhel-9-for-x86_64-baseos-kickstart',
'name': 'Red Hat Enterprise Linux 9 for x86_64 - BaseOS Kickstart 9.3',
'version': '9.3',
'reposet': REPOSET['kickstart']['rhel9'],
'reposet': REPOSET['kickstart']['rhel9_bos'],
'product': PRDS['rhel9'],
'distro': 'rhel9',
},
Expand Down
18 changes: 7 additions & 11 deletions tests/foreman/api/test_repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1121,7 +1121,7 @@ def test_module_stream_repository_crud_operations(self, repo):
with pytest.raises(HTTPError):
repo.read()

def test_positive_recreate_pulp_repositories(self, module_entitlement_manifest_org, target_sat):
def test_positive_recreate_pulp_repositories(self, module_sca_manifest_org, target_sat):
"""Verify that deleted Pulp Repositories can be recreated using the
command 'foreman-rake katello:correct_repositories COMMIT=true'

Expand All @@ -1136,7 +1136,7 @@ def test_positive_recreate_pulp_repositories(self, module_entitlement_manifest_o
"""
repo_id = target_sat.api_factory.enable_rhrepo_and_fetchid(
basearch='x86_64',
org_id=module_entitlement_manifest_org.id,
org_id=module_sca_manifest_org.id,
product=constants.PRDS['rhel'],
repo=constants.REPOS['rhst7']['name'],
reposet=constants.REPOSET['rhst7'],
Expand Down Expand Up @@ -1434,9 +1434,7 @@ def test_positive_sync_sha_repo(self, repo, target_sat):
assert result.status == 1

@pytest.mark.tier2
def test_positive_sync_repo_null_contents_changed(
self, module_entitlement_manifest_org, target_sat
):
def test_positive_sync_repo_null_contents_changed(self, module_sca_manifest_org, target_sat):
"""test for null contents_changed parameter on actions::katello::repository::sync.

:id: f3923940-e097-4da3-aba7-b14dbcda857b
Expand All @@ -1454,7 +1452,7 @@ def test_positive_sync_repo_null_contents_changed(
"""
repo_id = target_sat.api_factory.enable_rhrepo_and_fetchid(
basearch='x86_64',
org_id=module_entitlement_manifest_org.id,
org_id=module_sca_manifest_org.id,
product=constants.PRDS['rhel'],
repo=constants.REPOS['rhst7']['name'],
reposet=constants.REPOSET['rhst7'],
Expand All @@ -1477,9 +1475,7 @@ def test_positive_sync_repo_null_contents_changed(
if isinstance(ver, int)
],
)
def test_positive_sync_kickstart_check_os(
self, module_entitlement_manifest_org, distro, target_sat
):
def test_positive_sync_kickstart_check_os(self, module_sca_manifest_org, distro, target_sat):
"""Sync rhel KS repo and assert that OS was created

:id: f84bcf1b-717e-40e7-82ee-000eead45249
Expand All @@ -1494,10 +1490,10 @@ def test_positive_sync_kickstart_check_os(
1. OS with corresponding version was created.

"""
distro = f'rhel{distro} + "_bos"' if distro > 7 else f'rhel{distro}'
distro = f'rhel{distro}_bos' if distro > 7 else f'rhel{distro}'
repo_id = target_sat.api_factory.enable_rhrepo_and_fetchid(
basearch='x86_64',
org_id=module_entitlement_manifest_org.id,
org_id=module_sca_manifest_org.id,
product=constants.REPOS['kickstart'][distro]['product'],
reposet=constants.REPOSET['kickstart'][distro],
repo=constants.REPOS['kickstart'][distro]['name'],
Expand Down
2 changes: 1 addition & 1 deletion tests/foreman/cli/test_repositories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def test_positive_disable_rh_repo_with_basearch(module_target_sat, module_entitl
disabled_repo = module_target_sat.cli.RepositorySet.disable(
{
'basearch': DEFAULT_ARCHITECTURE,
'name': REPOSET['kickstart']['rhel8'],
'name': REPOSET['kickstart']['rhel8_bos'],
'product-id': repo.product.id,
'organization-id': module_entitlement_manifest_org.id,
'releasever': REPOS['kickstart']['rhel8_aps']['version'],
Expand Down
4 changes: 2 additions & 2 deletions tests/foreman/ui/test_repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,7 +831,7 @@ def test_positive_delete_random_docker_repo(session, module_org, module_target_s


@pytest.mark.tier2
def test_positive_delete_rhel_repo(session, module_entitlement_manifest_org, target_sat):
def test_positive_delete_rhel_repo(session, module_sca_manifest_org, target_sat):
"""Enable and sync a Red Hat Repository, and then delete it

:id: e96f369d-3e58-4824-802e-0b7e99d6d207
Expand All @@ -847,7 +847,7 @@ def test_positive_delete_rhel_repo(session, module_entitlement_manifest_org, tar
repository_name = sat_tools_repo.data['repository']
product_name = sat_tools_repo.data['product']
with session:
session.organization.select(module_entitlement_manifest_org.name)
session.organization.select(module_sca_manifest_org.name)
session.redhatrepository.enable(
sat_tools_repo.data['repository-set'],
sat_tools_repo.data['arch'],
Expand Down
6 changes: 3 additions & 3 deletions tests/foreman/ui/test_sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def module_custom_product(module_org, module_target_sat):
@pytest.mark.skip_if_not_set('fake_manifest')
@pytest.mark.tier2
@pytest.mark.upgrade
def test_positive_sync_rh_repos(session, target_sat, module_entitlement_manifest_org):
def test_positive_sync_rh_repos(session, target_sat, module_sca_manifest_org):
"""Create Content RedHat Sync with two repos.
:id: e30f6509-0b65-4bcc-a522-b4f3089d3911
Expand All @@ -57,7 +57,7 @@ def test_positive_sync_rh_repos(session, target_sat, module_entitlement_manifest
for distro, repo in zip(distros, repos, strict=True)
]
for repo_collection in repo_collections:
repo_collection.setup(module_entitlement_manifest_org.id, synchronize=False)
repo_collection.setup(module_sca_manifest_org.id, synchronize=False)
repo_paths = [
(
repo.repo_data['product'],
Expand All @@ -68,7 +68,7 @@ def test_positive_sync_rh_repos(session, target_sat, module_entitlement_manifest
for repo in repos
]
with session:
session.organization.select(org_name=module_entitlement_manifest_org.name)
session.organization.select(org_name=module_sca_manifest_org.name)
results = session.sync_status.synchronize(repo_paths)
assert len(results) == len(repo_paths)
assert all([result == 'Syncing Complete.' for result in results])
Expand Down