From 9c41e583ad97d04609a14dab2c7ae2e4c19fe404 Mon Sep 17 00:00:00 2001 From: karthikaeyetea Date: Wed, 4 May 2022 10:43:18 +0530 Subject: [PATCH] Changed class and function names Signed-off-by: karthikaeyetea --- .../wpa2_personal/test_nat_multi_sta_performance.py | 3 +-- .../wpa3_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa3.py | 1 + .../wpa3_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa3.py | 1 + .../wpa3_enterprise/twog/test_dynamic_over_ssid_twog_wpa3.py | 1 + .../wpa3_enterprise/twog/test_dynamic_vlan_twog_wpa3.py | 1 - 5 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/e2e/advanced/multi_station_performance/wpa2_personal/test_nat_multi_sta_performance.py b/tests/e2e/advanced/multi_station_performance/wpa2_personal/test_nat_multi_sta_performance.py index d5942bb1a..c972579e6 100644 --- a/tests/e2e/advanced/multi_station_performance/wpa2_personal/test_nat_multi_sta_performance.py +++ b/tests/e2e/advanced/multi_station_performance/wpa2_personal/test_nat_multi_sta_performance.py @@ -4,8 +4,7 @@ import os import time import pandas as pd -pytestmark = [pytest.mark.advance, pytest.mark.multistaperf, pytest.mark.nat] - +# pytestmark = [pytest.mark.advance, pytest.mark.multistaperf, pytest.mark.nat] setup_params_general = { diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa3.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa3.py index 9d621b5f0..41bcb3c4f 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa3.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa3.py @@ -41,6 +41,7 @@ setup_params_general = { ) @pytest.mark.usefixtures("setup_profiles") class TestDynamicVlanOverSsid5GWpa3(object): + @pytest.mark.dynamic_precedence_over_ssid @pytest.mark.wpa3_enterprise @pytest.mark.fiveg diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa3.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa3.py index 84c4dfb0e..8d907a590 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa3.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa3.py @@ -42,6 +42,7 @@ setup_params_general = { ) @pytest.mark.usefixtures("setup_profiles") class TestDynamicVlan5GWpa3(object): + @pytest.mark.absence_of_radius_vlan_identifier @pytest.mark.wpa3_enterprise @pytest.mark.fiveg diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_over_ssid_twog_wpa3.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_over_ssid_twog_wpa3.py index 71630bb1b..d1b66e5eb 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_over_ssid_twog_wpa3.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_over_ssid_twog_wpa3.py @@ -41,6 +41,7 @@ setup_params_general = { ) @pytest.mark.usefixtures("setup_profiles") class TestDynamicVlanOverSsid2GWpa3(object): + @pytest.mark.dynamic_precedence_over_ssid @pytest.mark.wpa3_enterprise @pytest.mark.twog diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_vlan_twog_wpa3.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_vlan_twog_wpa3.py index e4a8a0aa9..dc6c17695 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_vlan_twog_wpa3.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_vlan_twog_wpa3.py @@ -329,7 +329,6 @@ class TestDynamicVlan2GWpa3(object): @pytest.mark.wpa3_enterprise @pytest.mark.twog @allure.testcase(name="test_dynamic_unsupported_vlan", -<<<<<<< HEAD <<<<<<< HEAD url="https://telecominfraproject.atlassian.net/browse/WIFI-6102") =======