From 480fe19cd4cf9d87b0e30b70c506e3937b0705fa Mon Sep 17 00:00:00 2001 From: shivamcandela Date: Tue, 28 Sep 2021 10:26:17 +0530 Subject: [PATCH] fixed performance marker adjustments Signed-off-by: shivamcandela --- .../open_security/test_bridge_mode.py | 2 +- .../open_security/test_nat_mode.py | 2 +- .../open_security/test_vlan_mode.py | 9 +-------- .../wpa3_security/test_bridge_mode.py | 2 +- .../wpa3_security/test_nat_mode.py | 2 +- .../wpa3_security/test_vlan_mode.py | 2 +- .../wpa_security/test_bridge_mode.py | 2 +- .../wpa_security/test_nat_mode.py | 2 +- .../wpa_security/test_vlan_mode.py | 2 +- .../dual_band_performance_test/open/test_bridge_mode.py | 2 +- .../dual_band_performance_test/open/test_nat_mode.py | 2 +- .../dual_band_performance_test/open/test_vlan_mode.py | 2 +- .../wap3_personal/test_bridge_mode.py | 2 +- .../wap3_personal/test_nat_mode.py | 2 +- .../wap3_personal/test_vlan_mode.py | 2 +- .../wpa_personal/test_bridge_mode.py | 2 +- .../wpa_personal/test_nat_mode.py | 2 +- .../wpa_personal/test_vlan_mode.py | 2 +- 18 files changed, 18 insertions(+), 25 deletions(-) diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_bridge_mode.py index e27e94bad..486e22aab 100644 --- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_bridge_mode.py @@ -8,7 +8,7 @@ import os import pytest import allure -pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test, +pytestmark = [pytest.mark.dataplane_throughput_test, pytest.mark.bridge] # , pytest.mark.usefixtures("setup_test_run")] setup_params_general = { diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_nat_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_nat_mode.py index 53f6c1c94..f4dc438db 100644 --- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_nat_mode.py @@ -8,7 +8,7 @@ import os import pytest import allure -pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test, +pytestmark = [pytest.mark.dataplane_throughput_test, pytest.mark.nat] setup_params_general = { diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_vlan_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_vlan_mode.py index 32897c187..6cc32ba11 100644 --- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_vlan_mode.py +++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_vlan_mode.py @@ -8,7 +8,7 @@ import os import pytest import allure -pytestmark = [pytest.mark.performance, pytest.mark.vlan, pytest.mark.dataplane_throughput_test] +pytestmark = [pytest.mark.vlan, pytest.mark.dataplane_throughput_test] setup_params_general = { "mode": "VLAN", @@ -30,13 +30,6 @@ setup_params_general = { scope="class" ) @pytest.mark.usefixtures("setup_profiles") -@pytest.mark.parametrize( - 'create_vlan', - [setup_params_general], - indirect=True, - scope="class" -) -@pytest.mark.usefixtures("create_vlan") class TestDataplaneThroughputVLAN(object): """Dataplane THroughput VLAN Mode pytest -m "dataplane_throughput_test and open and VLAN" diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_bridge_mode.py index 46bb4b4e4..22d8bccd2 100644 --- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_bridge_mode.py @@ -8,7 +8,7 @@ import os import pytest import allure -pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test, +pytestmark = [pytest.mark.dataplane_throughput_test, pytest.mark.bridge] # , pytest.mark.usefixtures("setup_test_run")] setup_params_general = { diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_nat_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_nat_mode.py index 56a64b3b0..412da64fa 100644 --- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_nat_mode.py @@ -8,7 +8,7 @@ import os import pytest import allure -pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test, pytest.mark.nat] +pytestmark = [pytest.mark.dataplane_throughput_test, pytest.mark.nat] setup_params_general = { "mode": "NAT", diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_vlan_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_vlan_mode.py index 111202b41..d67192012 100644 --- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_vlan_mode.py +++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_vlan_mode.py @@ -8,7 +8,7 @@ import os import pytest import allure -pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test, pytest.mark.vlan] +pytestmark = [pytest.mark.dataplane_throughput_test, pytest.mark.vlan] setup_params_general = { "mode": "VLAN", diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_bridge_mode.py index daf61a5f9..5c9527887 100644 --- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_bridge_mode.py @@ -8,7 +8,7 @@ import os import pytest import allure -pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test, +pytestmark = [pytest.mark.dataplane_throughput_test, pytest.mark.bridge] setup_params_general = { diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_nat_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_nat_mode.py index 9a261d4b2..f89ddd97c 100644 --- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_nat_mode.py @@ -8,7 +8,7 @@ import os import pytest import allure -pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test, +pytestmark = [pytest.mark.dataplane_throughput_test, pytest.mark.nat] setup_params_general = { diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_vlan_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_vlan_mode.py index ed2fae8e5..e793d39d8 100644 --- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_vlan_mode.py +++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_vlan_mode.py @@ -8,7 +8,7 @@ import os import pytest import allure -pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test, pytest.mark.vlan] +pytestmark = [pytest.mark.dataplane_throughput_test, pytest.mark.vlan] setup_params_general = { "mode": "VLAN", diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_bridge_mode.py index eaf213be5..163bc3eed 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_bridge_mode.py @@ -9,7 +9,7 @@ import os import allure import pytest -pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.bridge, pytest.mark.performance_release]#, +pytestmark = [pytest.mark.dual_band_test, pytest.mark.bridge, pytest.mark.performance_release]#, # pytest.mark.usefixtures("setup_test_run")] setup_params_general = { diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_nat_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_nat_mode.py index d85f8d7af..481c6cb2c 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_nat_mode.py @@ -9,7 +9,7 @@ import os import allure import pytest -pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.nat, pytest.mark.performance_release]#, +pytestmark = [pytest.mark.dual_band_test, pytest.mark.nat, pytest.mark.performance_release]#, # pytest.mark.usefixtures("setup_test_run")] setup_params_general = { diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_vlan_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_vlan_mode.py index 320adb703..84a118fcd 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_vlan_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_vlan_mode.py @@ -9,7 +9,7 @@ import os import allure import pytest -pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.vlan, pytest.mark.performance_release]#, +pytestmark = [pytest.mark.dual_band_test, pytest.mark.vlan, pytest.mark.performance_release]#, # pytest.mark.usefixtures("setup_test_run")] setup_params_general = { diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_bridge_mode.py index 31c335108..ebaddd13d 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_bridge_mode.py @@ -9,7 +9,7 @@ import os import allure import pytest -pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.bridge, pytest.mark.sss, +pytestmark = [pytest.mark.dual_band_test, pytest.mark.bridge, pytest.mark.sss, pytest.mark.single_station_dual_band_throughput]# pytest.mark.usefixtures("setup_test_run")] setup_params_general = { diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_nat_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_nat_mode.py index 477587147..ce77572dd 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_nat_mode.py @@ -9,7 +9,7 @@ import os import allure import pytest -pytestmark = [pytest.mark.performance, pytest.mark.nat, pytest.mark.dual_band_test]#, +pytestmark = [pytest.mark.nat, pytest.mark.dual_band_test]#, # pytest.mark.usefixtures("setup_test_run")] diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_vlan_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_vlan_mode.py index 08d51bf1e..92f9db8c4 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_vlan_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_vlan_mode.py @@ -9,7 +9,7 @@ import os import allure import pytest -pytestmark = [pytest.mark.performance, pytest.mark.vlan, pytest.mark.dual_band_test]#, +pytestmark = [pytest.mark.vlan, pytest.mark.dual_band_test]#, # pytest.mark.usefixtures("setup_test_run")] diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_bridge_mode.py index 0b49c466a..b617ea4bf 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_bridge_mode.py @@ -9,7 +9,7 @@ import os import allure import pytest -pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.bridge, pytest.mark.sss, +pytestmark = [pytest.mark.dual_band_test, pytest.mark.bridge, pytest.mark.sss, pytest.mark.single_station_dual_band_throughput]# pytest.mark.usefixtures("setup_test_run")] setup_params_general = { diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_nat_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_nat_mode.py index 64f2f6c0d..cf4c0f74d 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_nat_mode.py @@ -9,7 +9,7 @@ import os import allure import pytest -pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.nat, +pytestmark = [pytest.mark.dual_band_test, pytest.mark.nat, pytest.mark.single_station_dual_band_throughput] setup_params_general = { "mode": "NAT", diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_vlan_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_vlan_mode.py index 68e433513..8a807b47e 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_vlan_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_vlan_mode.py @@ -9,7 +9,7 @@ import os import allure import pytest -pytestmark = [pytest.mark.performance, pytest.mark.vlan, pytest.mark.dual_band_test]#, +pytestmark = [pytest.mark.vlan, pytest.mark.dual_band_test]#, # pytest.mark.usefixtures("setup_test_run")]