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

[6.14.z] Remove sleeps and make cron expression more accurate #15210

Merged
merged 1 commit into from
May 29, 2024
Merged

[6.14.z] Remove sleeps and make cron expression more accurate #15210

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
19 changes: 8 additions & 11 deletions tests/foreman/ui/test_syncplan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"""

from datetime import datetime, timedelta
import time

from fauxfactory import gen_choice
from nailgun import entities
Expand Down Expand Up @@ -198,10 +197,9 @@ def test_positive_synchronize_custom_product_custom_cron_real_time(session, modu
# workaround: force session.browser to point to browser object on next line
session.contenthost.read_all('current_user')
start_date = session.browser.get_client_datetime()
next_sync = 3 * 60
# forming cron expression sync repo after 3 min
expected_next_run_time = start_date + timedelta(seconds=next_sync)
cron_expression = f'{expected_next_run_time.minute} * * * *'
# forming cron expression sync repo after 5 min
expected_next_run_time = start_date + timedelta(minutes=5)
cron_expression = f'{expected_next_run_time.minute} {expected_next_run_time.hour} {expected_next_run_time.day} {expected_next_run_time.month} *'
session.syncplan.create(
{
'name': plan_name,
Expand All @@ -228,13 +226,13 @@ def test_positive_synchronize_custom_product_custom_cron_real_time(session, modu
assert 'No task was found using query' in str(context.value)
validate_repo_content(repo, ['erratum', 'rpm', 'package_group'], after_sync=False)
# Waiting part of delay that is left and check that product was synced
time.sleep(next_sync)
target_sat.wait_for_tasks(
search_query='Actions::Katello::Repository::Sync'
f' and organization_id = {module_org.id}'
f' and resource_id = {repo.id}'
' and resource_type = Katello::Repository',
search_rate=10,
max_tries=20,
)
validate_repo_content(repo, ['erratum', 'rpm', 'package_group'])
repo_values = session.repository.read(product.name, repo.name)
Expand Down Expand Up @@ -264,10 +262,9 @@ def test_positive_synchronize_custom_product_custom_cron_past_sync_date(
# workaround: force session.browser to point to browser object on next line
session.contenthost.read_all('current_user')
start_date = session.browser.get_client_datetime()
next_sync = 3 * 60
# forming cron expression sync repo after 3 min
expected_next_run_time = start_date + timedelta(seconds=next_sync)
cron_expression = f'{expected_next_run_time.minute} * * * *'
# forming cron expression sync repo after 5 min
expected_next_run_time = start_date + timedelta(minutes=5)
cron_expression = f'{expected_next_run_time.minute} {expected_next_run_time.hour} {expected_next_run_time.day} {expected_next_run_time.month} *'
session.syncplan.create(
{
'name': plan_name,
Expand All @@ -294,13 +291,13 @@ def test_positive_synchronize_custom_product_custom_cron_past_sync_date(
assert 'No task was found using query' in str(context.value)
validate_repo_content(repo, ['erratum', 'rpm', 'package_group'], after_sync=False)
# Waiting part of delay that is left and check that product was synced
time.sleep(next_sync)
target_sat.wait_for_tasks(
search_query='Actions::Katello::Repository::Sync'
f' and organization_id = {module_org.id}'
f' and resource_id = {repo.id}'
' and resource_type = Katello::Repository',
search_rate=10,
max_tries=20,
)
validate_repo_content(repo, ['erratum', 'rpm', 'package_group'])
repo_values = session.repository.read(product.name, repo.name)
Expand Down
Loading