From fae849c573a826578f69b77169af88bd6826fc3f Mon Sep 17 00:00:00 2001 From: Lukas Pramuk Date: Mon, 21 Oct 2024 12:15:15 +0200 Subject: [PATCH] Revert "[6.16.z] Fetch pre_upgrade data based on node properties (#16550)" This reverts commit e64fa802faccc63d3bc97b0ff5d352f6d5bfed12. --- tests/upgrades/conftest.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/upgrades/conftest.py b/tests/upgrades/conftest.py index 03f1b41e3fb..afa8c8eb21c 100644 --- a/tests/upgrades/conftest.py +++ b/tests/upgrades/conftest.py @@ -90,7 +90,6 @@ def test_capsule_post_upgrade_skipped(pre_upgrade_data): from box import Box import pytest -from robottelo.config import settings from robottelo.logging import logger from robottelo.utils.decorators.func_locker import lock_function @@ -261,13 +260,11 @@ def test_something_post_upgrade(pre_upgrade_data): start_index = test_node_id.find('[') + 1 end_index = test_node_id.find(']') extracted_value = test_node_id[start_index:end_index] - if request.param in extracted_value: - upgrade_data[extracted_value] = _read_test_data(test_node_id) + upgrade_data[extracted_value] = _read_test_data(test_node_id) if len(upgrade_data) == 1: param_value = next(iter(upgrade_data.values())) else: - network_type = 'ipv6' if settings.server.is_ipv6 else 'ipv4' - param_value = upgrade_data.get(f'{request.param}-{network_type}') + param_value = upgrade_data.get(request.param) if param_value is None: pytest.fail(f"Invalid test parameter: {request.param}. Test data not found.") return Box(param_value)