Merge pull request #15119 from donaldsharp/pytest_mgmtd

tests: Add mgmtd to the official pytest.mark list

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,

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, pytest.mark.mgmtd]
-pytestmark = [pytest.mark.staticd]
 
 
 @retry(retry_timeout=1, initial_wait=0.1)

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")

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")

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")

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")

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")

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")

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")

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, pytest.mark.mgmtd]
-pytestmark = [pytest.mark.staticd]
 
 
 track = Timeout(0)

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, pytest.mark.mgmtd]
-pytestmark = [pytest.mark.staticd]
 
 
 @pytest.fixture(scope="module")

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, pytest.mark.mgmtd]
-pytestmark = [pytest.mark.staticd]
 
 track = Timeout(0)
 ROUTE_COUNT = 2500

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, pytest.mark.mgmtd]
-pytestmark = [pytest.mark.staticd]
 
 
 @pytest.fixture(scope="module")

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, pytest.mark.mgmtd]
-pytestmark = [pytest.mark.staticd]
 
 
 @pytest.fixture(scope="module")

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()

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