tests: Add mgmtd to the official pytest.mark list

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/tests/topotests/grpc_basic/test_basic_grpc.py b/tests/topotests/grpc_basic/test_basic_grpc.py
index 88bfa98d2ff2959036ca6894085a31b174e86ed8..bb57705a7036fb5e28424b3b0fe2f567d2c5fcdc 100644 (file)
--- 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 b07ed8f7fde4594d4aa8f4dc9335271d473a6ffb..1d732223fff8cd8935233a80b6eb931f2a7411c9 100644 (file)
--- 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 00c3e01724fe65f7c037268b2c48a3dec6a96d2f..70f38d2ec7659fa0c513c07d392943ac35fcabe3 100644 (file)
--- 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 b0ab71e9bdeb6b1be661d38c7b7abc1f23d54f15..e49d9b7beb41dfa24344cebc812f4b92fee360d7 100644 (file)
--- 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 6268d2f123e33cf7f6ab74afee960bf19faaa352..8383e23bb60c3633401d379a58dacb60c28763b9 100644 (file)
--- 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 e8d5cfb50b0e74b39fa9d5199d1f985993e9955f..6971eafc57e0b5f73016946329f156fe51ce3dc4 100644 (file)
--- 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 e53ea52c987a4dab8a4cbc81c41cba49fa01269e..83fbbfcc104396401ba641b37abde979d4b82347 100644 (file)
--- 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 d7a0e25ad8196124cfc63b865bea7a70e56c6a71..b6d477ae90c28fdd88dd1b2efe1ace2cb2408a16 100644 (file)
--- 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 1f9f21b8defba3af75d0c243f55426e442bb17bc..32988e77dcef807db48b49d5b184f203029e40e6 100644 (file)
--- 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 4f46c8fabdcafdee700c2f88aae227b2e268c139..1c08fe6ca387e5c136f90be06f3cf3fe9cca75ad 100644 (file)
--- 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 6a54f7191011d380e5216209876807fd553b4cf6..8203ae57ff99a992f621fbc36f92cc5b0d87d07f 100644 (file)
--- 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 0b5bf38d10477304e7ad23695c0dbfa42289faef..5bf345732bcda134f49fa63ed1f66800503a4f47 100644 (file)
--- 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 d4e7e07ad633260c4c8ce708a13274325c5bf0e6..380c2eb20b6f0c04e175b23c881526d04458f2a8 100644 (file)
--- 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 1c97b9dd0fca5db130dacc5a0a5edcd814370617..c0c0121d0545f68e664da41dddca9b3b09dae036 100644 (file)
--- 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 921b4e622cb811a06bdd1016efcc9d191ec5e801..bf4e95b275e2d92c8a0fc0b96cdfac0703be10e5 100644 (file)
--- 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 d61a0a1ee115abe3bdc6577bdf9cd0feeb66690e..98fcfbc848bba61ba19254b8e95533bea0cf972a 100644 (file)
--- 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