From b1a39549df57dd35773bbe7cb35fa789a3500a8e Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Mon, 8 Jan 2024 07:58:14 -0500 Subject: [PATCH] tests: Add mgmtd to the official pytest.mark list Signed-off-by: Donald Sharp --- tests/topotests/grpc_basic/test_basic_grpc.py | 2 +- tests/topotests/mgmt_config/test_config.py | 3 +-- tests/topotests/mgmt_config/test_regression.py | 2 +- tests/topotests/mgmt_debug_flags/test_debug.py | 2 +- tests/topotests/mgmt_fe_client/test_client.py | 2 +- tests/topotests/mgmt_oper/test_oper.py | 2 +- tests/topotests/mgmt_oper/test_querying.py | 2 +- tests/topotests/mgmt_oper/test_scale.py | 2 +- tests/topotests/mgmt_oper/test_simple.py | 2 +- tests/topotests/mgmt_startup/test_bigconf.py | 3 +-- tests/topotests/mgmt_startup/test_cfgfile_var.py | 3 +-- tests/topotests/mgmt_startup/test_late_bigconf.py | 3 +-- tests/topotests/mgmt_startup/test_late_uniconf.py | 3 +-- tests/topotests/mgmt_startup/test_latestart.py | 3 +-- tests/topotests/mgmt_tests/test_yang_mgmt.py | 2 +- tests/topotests/pytest.ini | 1 + 16 files changed, 16 insertions(+), 21 deletions(-) diff --git a/tests/topotests/grpc_basic/test_basic_grpc.py b/tests/topotests/grpc_basic/test_basic_grpc.py index 88bfa98d2f..bb57705a70 100644 --- a/tests/topotests/grpc_basic/test_basic_grpc.py +++ b/tests/topotests/grpc_basic/test_basic_grpc.py @@ -30,7 +30,7 @@ GRPCP_OSPFD = 50055 GRPCP_PIMD = 50056 pytestmark = [ - # pytest.mark.mgmtd -- Need a new non-protocol marker + pytest.mark.mgmtd, # pytest.mark.bfdd, # pytest.mark.isisd, # pytest.mark.ospfd, diff --git a/tests/topotests/mgmt_config/test_config.py b/tests/topotests/mgmt_config/test_config.py index b07ed8f7fd..1d732223ff 100644 --- a/tests/topotests/mgmt_config/test_config.py +++ b/tests/topotests/mgmt_config/test_config.py @@ -61,8 +61,7 @@ import pytest from lib.common_config import retry, step from lib.topogen import Topogen, TopoRouter -# pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd] -pytestmark = [pytest.mark.staticd] +pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd] @retry(retry_timeout=1, initial_wait=0.1) diff --git a/tests/topotests/mgmt_config/test_regression.py b/tests/topotests/mgmt_config/test_regression.py index 00c3e01724..70f38d2ec7 100644 --- a/tests/topotests/mgmt_config/test_regression.py +++ b/tests/topotests/mgmt_config/test_regression.py @@ -12,7 +12,7 @@ Test mgmtd regressions import pytest from lib.topogen import Topogen -pytestmark = [pytest.mark.staticd] +pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd] @pytest.fixture(scope="module") diff --git a/tests/topotests/mgmt_debug_flags/test_debug.py b/tests/topotests/mgmt_debug_flags/test_debug.py index b0ab71e9bd..e49d9b7beb 100644 --- a/tests/topotests/mgmt_debug_flags/test_debug.py +++ b/tests/topotests/mgmt_debug_flags/test_debug.py @@ -16,7 +16,7 @@ from lib.common_config import step from lib.topogen import Topogen from munet.watchlog import WatchLog -pytestmark = [pytest.mark.staticd] +pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd] @pytest.fixture(scope="module") diff --git a/tests/topotests/mgmt_fe_client/test_client.py b/tests/topotests/mgmt_fe_client/test_client.py index 6268d2f123..8383e23bb6 100644 --- a/tests/topotests/mgmt_fe_client/test_client.py +++ b/tests/topotests/mgmt_fe_client/test_client.py @@ -15,7 +15,7 @@ import pytest from lib.topogen import Topogen from oper import check_kernel_32 -pytestmark = [pytest.mark.staticd] +pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd] @pytest.fixture(scope="module") diff --git a/tests/topotests/mgmt_oper/test_oper.py b/tests/topotests/mgmt_oper/test_oper.py index e8d5cfb50b..6971eafc57 100644 --- a/tests/topotests/mgmt_oper/test_oper.py +++ b/tests/topotests/mgmt_oper/test_oper.py @@ -23,7 +23,7 @@ try: except ImportError: dd_json_cmp = None -pytestmark = [pytest.mark.staticd] +pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd] @pytest.fixture(scope="module") diff --git a/tests/topotests/mgmt_oper/test_querying.py b/tests/topotests/mgmt_oper/test_querying.py index e53ea52c98..83fbbfcc10 100644 --- a/tests/topotests/mgmt_oper/test_querying.py +++ b/tests/topotests/mgmt_oper/test_querying.py @@ -19,7 +19,7 @@ from lib.common_config import step from lib.topogen import Topogen from oper import check_kernel_32 -pytestmark = [pytest.mark.staticd] +pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd] @pytest.fixture(scope="module") diff --git a/tests/topotests/mgmt_oper/test_scale.py b/tests/topotests/mgmt_oper/test_scale.py index d7a0e25ad8..b6d477ae90 100644 --- a/tests/topotests/mgmt_oper/test_scale.py +++ b/tests/topotests/mgmt_oper/test_scale.py @@ -19,7 +19,7 @@ from lib.common_config import step from lib.topogen import Topogen, TopoRouter from oper import check_kernel_32 -pytestmark = [pytest.mark.staticd] +pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd] @pytest.fixture(scope="module") diff --git a/tests/topotests/mgmt_oper/test_simple.py b/tests/topotests/mgmt_oper/test_simple.py index 1f9f21b8de..32988e77dc 100644 --- a/tests/topotests/mgmt_oper/test_simple.py +++ b/tests/topotests/mgmt_oper/test_simple.py @@ -15,7 +15,7 @@ import pytest from lib.topogen import Topogen from oper import check_kernel_32, do_oper_test -pytestmark = [pytest.mark.staticd] +pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd] @pytest.fixture(scope="module") diff --git a/tests/topotests/mgmt_startup/test_bigconf.py b/tests/topotests/mgmt_startup/test_bigconf.py index 4f46c8fabd..1c08fe6ca3 100644 --- a/tests/topotests/mgmt_startup/test_bigconf.py +++ b/tests/topotests/mgmt_startup/test_bigconf.py @@ -21,8 +21,7 @@ from util import check_kernel, check_vtysh_up, write_big_route_conf CWD = os.path.dirname(os.path.realpath(__file__)) -# pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd] -pytestmark = [pytest.mark.staticd] +pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd] track = Timeout(0) diff --git a/tests/topotests/mgmt_startup/test_cfgfile_var.py b/tests/topotests/mgmt_startup/test_cfgfile_var.py index 6a54f71910..8203ae57ff 100644 --- a/tests/topotests/mgmt_startup/test_cfgfile_var.py +++ b/tests/topotests/mgmt_startup/test_cfgfile_var.py @@ -31,8 +31,7 @@ from lib.common_config import step from lib.topogen import Topogen, TopoRouter from util import check_kernel -# pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd] -pytestmark = [pytest.mark.staticd] +pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd] @pytest.fixture(scope="module") diff --git a/tests/topotests/mgmt_startup/test_late_bigconf.py b/tests/topotests/mgmt_startup/test_late_bigconf.py index 0b5bf38d10..5bf345732b 100644 --- a/tests/topotests/mgmt_startup/test_late_bigconf.py +++ b/tests/topotests/mgmt_startup/test_late_bigconf.py @@ -22,8 +22,7 @@ from util import check_kernel, check_vtysh_up, write_big_route_conf CWD = os.path.dirname(os.path.realpath(__file__)) -# pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd] -pytestmark = [pytest.mark.staticd] +pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd] track = Timeout(0) ROUTE_COUNT = 2500 diff --git a/tests/topotests/mgmt_startup/test_late_uniconf.py b/tests/topotests/mgmt_startup/test_late_uniconf.py index d4e7e07ad6..380c2eb20b 100644 --- a/tests/topotests/mgmt_startup/test_late_uniconf.py +++ b/tests/topotests/mgmt_startup/test_late_uniconf.py @@ -14,8 +14,7 @@ import pytest from lib.topogen import Topogen from util import _test_staticd_late_start -# pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd] -pytestmark = [pytest.mark.staticd] +pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd] @pytest.fixture(scope="module") diff --git a/tests/topotests/mgmt_startup/test_latestart.py b/tests/topotests/mgmt_startup/test_latestart.py index 1c97b9dd0f..c0c0121d05 100644 --- a/tests/topotests/mgmt_startup/test_latestart.py +++ b/tests/topotests/mgmt_startup/test_latestart.py @@ -14,8 +14,7 @@ import pytest from lib.topogen import Topogen, TopoRouter from util import _test_staticd_late_start -# pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd] -pytestmark = [pytest.mark.staticd] +pytestmark = [pytest.mark.staticd, pytest.mark.mgmtd] @pytest.fixture(scope="module") diff --git a/tests/topotests/mgmt_tests/test_yang_mgmt.py b/tests/topotests/mgmt_tests/test_yang_mgmt.py index 921b4e622c..bf4e95b275 100644 --- a/tests/topotests/mgmt_tests/test_yang_mgmt.py +++ b/tests/topotests/mgmt_tests/test_yang_mgmt.py @@ -68,7 +68,7 @@ from lib.topolog import logger from lib.bgp import verify_bgp_convergence, create_router_bgp, verify_bgp_rib from lib.topojson import build_config_from_json -pytestmark = [pytest.mark.bgpd, pytest.mark.staticd] +pytestmark = [pytest.mark.bgpd, pytest.mark.staticd, pytest.mark.mgmtd] # Global variables ADDR_TYPES = check_address_types() diff --git a/tests/topotests/pytest.ini b/tests/topotests/pytest.ini index d61a0a1ee1..98fcfbc848 100644 --- a/tests/topotests/pytest.ini +++ b/tests/topotests/pytest.ini @@ -45,6 +45,7 @@ markers = eigrpd: Tests that run against EIGRPD isisd: Tests that run against ISISD ldpd: Tests that run against LDPD + mgmtd: Tests that run against MGMTD nhrpd: Tests that run against NHRPD ospf6d: Tests that run against OSPF6D ospfd: Tests that run against OSPFD -- 2.39.5