Skip to content
Draft
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
27 changes: 15 additions & 12 deletions pytest_fixtures/core/sat_cap_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,28 +232,31 @@ def get_iop_deploy_args():


@pytest.fixture(scope='module')
def module_satellite_iop():
def module_satellite_iop(module_target_sat):
"""Deploy and configure Red Hat Lightspeed in Satellite

Use the IoP workflow which deploys Satellite + IoP
"""
deploy_args = get_iop_deploy_args()
# deploy_args = get_iop_deploy_args()

with Broker(
workflow=settings.server.deploy_workflows.iop, **deploy_args, host_class=Satellite
) as satellite:
yield satellite
# with Broker(
# workflow=settings.server.deploy_workflows.iop, **deploy_args, host_class=Satellite
# ) as satellite:
# satellite.execute('satellite-maintain service restart --only foreman')
# yield satellite
return module_target_sat


@pytest.fixture
def satellite_iop():
def satellite_iop(target_sat):
"""Deploy and configure Red Hat Lightspeed in Satellite"""
deploy_args = get_iop_deploy_args()
# deploy_args = get_iop_deploy_args()

with Broker(
workflow=settings.server.deploy_workflows.iop, **deploy_args, host_class=Satellite
) as satellite:
yield satellite
# with Broker(
# workflow=settings.server.deploy_workflows.iop, **deploy_args, host_class=Satellite
# ) as satellite:
# satellite.execute('satellite-maintain service restart --only foreman')
return target_sat


@pytest.fixture(scope='module')
Expand Down
4 changes: 2 additions & 2 deletions tests/foreman/ui/test_rhcloud_inventory.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ def test_rhcloud_inventory_e2e(


@pytest.mark.run_in_one_thread
def test_rh_cloud_inventory_settings(
def test_rhcloud_inventory_settings(
module_target_sat,
inventory_settings,
rhcloud_manifest_org,
Expand Down Expand Up @@ -589,7 +589,7 @@ def test_subscription_connection_settings_ui_behavior(request, module_target_sat

@pytest.mark.no_containers
@pytest.mark.run_in_one_thread
def test_rh_cloud_minimal_report(
def test_rhcloud_minimal_report(
module_target_sat,
inventory_settings,
rhcloud_manifest_org,
Expand Down