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.

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

Flip SyncPlan tests to SCA #14784

Merged
merged 1 commit into from
Apr 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 tests/foreman/api/test_syncplan.py
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ def test_positive_synchronize_custom_products_future_sync_date(module_org, reque
@pytest.mark.run_in_one_thread
@pytest.mark.tier4
def test_positive_synchronize_rh_product_past_sync_date(
request, function_entitlement_manifest_org, target_sat
request, function_sca_manifest_org, target_sat
):
"""Create a sync plan with past datetime as a sync date, add a
RH product and verify the product gets synchronized on the next sync
Expand All @@ -799,7 +799,7 @@ def test_positive_synchronize_rh_product_past_sync_date(
"""
interval = 60 * 60 # 'hourly' sync interval in seconds
delay = 2 * 60
org = function_entitlement_manifest_org
org = function_sca_manifest_org
repo_id = target_sat.api_factory.enable_rhrepo_and_fetchid(
basearch='x86_64',
org_id=org.id,
Expand Down Expand Up @@ -851,7 +851,7 @@ def test_positive_synchronize_rh_product_past_sync_date(
@pytest.mark.tier4
@pytest.mark.upgrade
def test_positive_synchronize_rh_product_future_sync_date(
request, function_entitlement_manifest_org, target_sat
request, function_sca_manifest_org, target_sat
):
"""Create a sync plan with sync date in a future and sync one RH
product with it automatically.
Expand All @@ -861,7 +861,7 @@ def test_positive_synchronize_rh_product_future_sync_date(
:expectedresults: Product is synchronized successfully.
"""
delay = 2 * 60 # delay for sync date in seconds
org = function_entitlement_manifest_org
org = function_sca_manifest_org
repo_id = target_sat.api_factory.enable_rhrepo_and_fetchid(
basearch='x86_64',
org_id=org.id,
Expand Down
8 changes: 4 additions & 4 deletions tests/foreman/cli/test_syncplan.py
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ def test_positive_synchronize_custom_products_future_sync_date(module_org, reque
@pytest.mark.tier4
@pytest.mark.upgrade
def test_positive_synchronize_rh_product_past_sync_date(
target_sat, function_entitlement_manifest_org, request
target_sat, function_sca_manifest_org, request
):
"""Create a sync plan with past datetime as a sync date, add a
RH product and verify the product gets synchronized on the next sync
Expand All @@ -594,7 +594,7 @@ def test_positive_synchronize_rh_product_past_sync_date(
"""
interval = 60 * 60 # 'hourly' sync interval in seconds
delay = 2 * 60
org = function_entitlement_manifest_org
org = function_sca_manifest_org
target_sat.cli.RepositorySet.enable(
{
'name': REPOSET['rhva6'],
Expand Down Expand Up @@ -647,7 +647,7 @@ def test_positive_synchronize_rh_product_past_sync_date(
@pytest.mark.tier4
@pytest.mark.upgrade
def test_positive_synchronize_rh_product_future_sync_date(
target_sat, function_entitlement_manifest_org, request
target_sat, function_sca_manifest_org, request
):
"""Create a sync plan with sync date in a future and sync one RH
product with it automatically.
Expand All @@ -661,7 +661,7 @@ def test_positive_synchronize_rh_product_future_sync_date(
cron_multiple = 5 # sync event is on every multiple of this value, starting from 00 mins
delay = (cron_multiple) * 60 # delay for sync date in seconds
guardtime = 180 # do not start test less than 2 mins before the next sync event
org = function_entitlement_manifest_org
org = function_sca_manifest_org
target_sat.cli.RepositorySet.enable(
{
'name': REPOSET['rhva6'],
Expand Down