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

Update manifest fixture in registration test to resolve conflict #13616

Merged
merged 1 commit into from
Jan 8, 2024
Merged

Update manifest fixture in registration test to resolve conflict #13616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Update manifest fixture in test
  • Loading branch information
@shweta83
shweta83 committed Jan 8, 2024
commit 598a93c3738b7884eda6c8622d2a5d43012d6998
4 changes: 2 additions & 2 deletions tests/foreman/api/test_registration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
@pytest.mark.e2e
@pytest.mark.no_containers
def test_host_registration_end_to_end(
module_entitlement_manifest_org,
module_sca_manifest_org,
module_location,
module_activation_key,
module_target_sat,
Expand All @@ -51,7 +51,7 @@ def test_host_registration_end_to_end(

:customerscenario: true
"""
org = module_entitlement_manifest_org
org = module_sca_manifest_org
command = module_target_sat.api.RegistrationCommand(
organization=org,
activation_keys=[module_activation_key.name],
Expand Down
4 changes: 2 additions & 2 deletions tests/foreman/cli/test_registration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
@pytest.mark.e2e
@pytest.mark.no_containers
def test_host_registration_end_to_end(
module_entitlement_manifest_org,
module_sca_manifest_org,
module_location,
module_activation_key,
module_target_sat,
Expand All @@ -48,7 +48,7 @@ def test_host_registration_end_to_end(

:customerscenario: true
"""
org = module_entitlement_manifest_org
org = module_sca_manifest_org
result = rhel_contenthost.register(
org, module_location, [module_activation_key.name], module_target_sat
)
Expand Down