From 111a8ce9675ebac2259cd05f05e0d6b72b7593a1 Mon Sep 17 00:00:00 2001 From: jitendracandela <78074038+jitendracandela@users.noreply.github.com> Date: Fri, 10 Feb 2023 19:54:54 +0530 Subject: [PATCH] Wifi 12247 (#781) * Fixed firmware upgrade issue and added firmware property after upgrade fixture Signed-off-by: jitendracandela * Added firmware property after upgrade in allure Signed-off-by: jitendracandela --------- Signed-off-by: jitendracandela --- tests/conftest.py | 12 ++++++++++-- tests/test_connectivity.py | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 561ff8d2c..5b4601910 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -199,7 +199,6 @@ def client_type(request): yield client_type - @pytest.fixture(scope="session") def get_security_flags(): """used to get the essential markers on security and band""" @@ -290,7 +289,7 @@ def get_testbed_details(selected_testbed, request): version = request.config.getini("firmware") version_list = version.split(",") for i in range(len(TESTBED["device_under_tests"])): - TESTBED["device_under_tests"][i]["version"] = version_list[0] + TESTBED["device_under_tests"][i]["firmware_version"] = version_list[0] allure.attach(name="Testbed Details", body=str(json.dumps(TESTBED, indent=2)), attachment_type=allure.attachment_type.JSON) yield TESTBED @@ -479,6 +478,15 @@ def get_test_device_logs(request, get_testbed_details, get_target_object, skip_l request.addfinalizer(collect_logs_tg) +@pytest.fixture(scope="session") +def add_firmware_property_after_upgrade(add_allure_environment_property, get_testbed_details, get_target_object): + dut_versions = get_target_object.get_dut_version() + for i in range(len(get_testbed_details["device_under_tests"])): + add_allure_environment_property( + "Firmware-Version_" + get_testbed_details["device_under_tests"][i]["identifier"], + str(dut_versions[i])) + + @pytest.fixture(scope="function") def check_connectivity(request, get_testbed_details, get_target_object, run_lf): def collect_logs(): diff --git a/tests/test_connectivity.py b/tests/test_connectivity.py index ae4fa14b6..eb0081dba 100644 --- a/tests/test_connectivity.py +++ b/tests/test_connectivity.py @@ -371,7 +371,7 @@ class TestFirmwareUpgrade(object): assert True @pytest.mark.test_firmware_gw - def test_firmware_upgrade_status_gateway(self, get_testbed_details, get_target_object): + def test_firmware_upgrade_status_gateway(self, get_testbed_details, get_target_object, add_firmware_property_after_upgrade): status = [] for ap in range(len(get_target_object.device_under_tests_info)): ap_version = get_target_object.dut_library_object.get_ap_version(idx=ap)