From 11176418dce24b364cb21bffbaa1c5bfbf00daa1 Mon Sep 17 00:00:00 2001 From: Ladislav Vasina Date: Wed, 25 Feb 2026 16:30:52 +0100 Subject: [PATCH 1/3] fixFutureDateSubsTest --- pytest_fixtures/component/taxonomy.py | 3 +-- tests/foreman/ui/test_subscription.py | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pytest_fixtures/component/taxonomy.py b/pytest_fixtures/component/taxonomy.py index ddbd55eee3d..83ff2a68791 100644 --- a/pytest_fixtures/component/taxonomy.py +++ b/pytest_fixtures/component/taxonomy.py @@ -229,5 +229,4 @@ def sca_manifest_for_upgrade(): def func_future_dated_subscription_manifest(target_sat, function_org): """Create and upload future date subscription manifest into org""" with Manifester(manifest_category=settings.manifest.future_date_subscription) as manifest: - target_sat.upload_manifest(function_org.id, manifest.content) - return manifest + yield manifest diff --git a/tests/foreman/ui/test_subscription.py b/tests/foreman/ui/test_subscription.py index b1d97ad099b..bd662a5b22f 100644 --- a/tests/foreman/ui/test_subscription.py +++ b/tests/foreman/ui/test_subscription.py @@ -371,6 +371,8 @@ def test_positive_populate_future_date_subcription( :customerscenario: true """ + target_sat.upload_manifest(function_org.id, func_future_dated_subscription_manifest.content) + with target_sat.ui_session() as session: session.organization.select(function_org.name) assert session.subscription.has_manifest, 'Manifest not uploaded' From f796619a098d9c8e2caef2810a8a59f8723e0459 Mon Sep 17 00:00:00 2001 From: Ladislav Vasina Date: Wed, 25 Feb 2026 16:43:39 +0100 Subject: [PATCH 2/3] Address comment --- pytest_fixtures/component/taxonomy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pytest_fixtures/component/taxonomy.py b/pytest_fixtures/component/taxonomy.py index 83ff2a68791..759cfaf4e4d 100644 --- a/pytest_fixtures/component/taxonomy.py +++ b/pytest_fixtures/component/taxonomy.py @@ -226,7 +226,7 @@ def sca_manifest_for_upgrade(): @pytest.fixture -def func_future_dated_subscription_manifest(target_sat, function_org): +def func_future_dated_subscription_manifest(function_org): """Create and upload future date subscription manifest into org""" with Manifester(manifest_category=settings.manifest.future_date_subscription) as manifest: yield manifest From 57a120ef6dc8b9e0e2f8cd96735dcbe1097e4aad Mon Sep 17 00:00:00 2001 From: Ladislav Vasina Date: Thu, 26 Feb 2026 08:20:04 +0100 Subject: [PATCH 3/3] changeFunctionComment --- pytest_fixtures/component/taxonomy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pytest_fixtures/component/taxonomy.py b/pytest_fixtures/component/taxonomy.py index 759cfaf4e4d..97f7ae2a3ea 100644 --- a/pytest_fixtures/component/taxonomy.py +++ b/pytest_fixtures/component/taxonomy.py @@ -226,7 +226,7 @@ def sca_manifest_for_upgrade(): @pytest.fixture -def func_future_dated_subscription_manifest(function_org): - """Create and upload future date subscription manifest into org""" +def func_future_dated_subscription_manifest(): + """Returns future dated manifest. Used only for future date subscription scenarios.""" with Manifester(manifest_category=settings.manifest.future_date_subscription) as manifest: yield manifest