From: Donald Sharp Date: Tue, 26 Jul 2022 13:53:22 +0000 (-0400) Subject: tests: Fixup more missing pytestmark annotations X-Git-Tag: base_8.4~195^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=cbdecd685cd640717b588e472aed5c8b7b16f864;p=mirror%2Ffrr.git tests: Fixup more missing pytestmark annotations Signed-off-by: Donald Sharp --- diff --git a/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_1.py b/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_1.py index ee71ae16e0..814272374a 100644 --- a/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_1.py +++ b/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_1.py @@ -82,6 +82,8 @@ from lib.common_config import ( ) +pytestmark = [pytest.mark.bgpd, pytest.mark.staticd] + # Save the Current Working Directory to find configuration files. CWD = os.path.dirname(os.path.realpath(__file__)) sys.path.append(os.path.join(CWD, "../")) diff --git a/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_2.py b/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_2.py index a9987a8f96..8e6f930633 100644 --- a/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_2.py +++ b/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_2.py @@ -81,6 +81,8 @@ from lib.common_config import ( ) +pytestmark = [pytest.mark.bgpd, pytest.mark.staticd] + # Save the Current Working Directory to find configuration files. CWD = os.path.dirname(os.path.realpath(__file__)) sys.path.append(os.path.join(CWD, "../")) diff --git a/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_3.py b/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_3.py index 95511568c6..9e5250406b 100644 --- a/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_3.py +++ b/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_3.py @@ -68,6 +68,7 @@ from lib.common_config import ( check_router_status, ) +pytestmark = [pytest.mark.bgpd, pytest.mark.staticd] # Save the Current Working Directory to find configuration files. CWD = os.path.dirname(os.path.realpath(__file__)) @@ -1138,6 +1139,7 @@ def test_verify_default_originate_after_BGP_and_FRR_restart_p2(request): write_test_footer(tc_name) + def test_verify_default_originate_after_shut_no_shut_bgp_neighbor_p1(request): """ Summary: "Verify default-originate route after shut/no shut and clear BGP neighbor " @@ -2532,6 +2534,7 @@ def test_verify_default_originate_after_shut_no_shut_bgp_neighbor_p1(request): write_test_footer(tc_name) + if __name__ == "__main__": args = ["-s"] + sys.argv[1:] sys.exit(pytest.main(args)) diff --git a/tests/topotests/bgp_default_originate/test_default_orginate_vrf.py b/tests/topotests/bgp_default_originate/test_default_orginate_vrf.py index d330a04439..fa5164fb71 100644 --- a/tests/topotests/bgp_default_originate/test_default_orginate_vrf.py +++ b/tests/topotests/bgp_default_originate/test_default_orginate_vrf.py @@ -73,6 +73,8 @@ from lib.common_config import ( delete_route_maps, ) +pytestmark = [pytest.mark.bgpd, pytest.mark.staticd] + # Save the Current Working Directory to find configuration files. CWD = os.path.dirname(os.path.realpath(__file__)) sys.path.append(os.path.join(CWD, "../")) diff --git a/tests/topotests/bgp_default_originate/test_default_originate_conditional_routemap.py b/tests/topotests/bgp_default_originate/test_default_originate_conditional_routemap.py index 272a7fe291..9e3a3b5660 100644 --- a/tests/topotests/bgp_default_originate/test_default_originate_conditional_routemap.py +++ b/tests/topotests/bgp_default_originate/test_default_originate_conditional_routemap.py @@ -74,6 +74,8 @@ CWD = os.path.dirname(os.path.realpath(__file__)) sys.path.append(os.path.join(CWD, "../")) sys.path.append(os.path.join(CWD, "../lib/")) +pytestmark = [pytest.mark.bgpd, pytest.mark.staticd] + # Required to instantiate the topology builder class. # pylint: disable=C0413 diff --git a/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_ibgp_nbr.py b/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_ibgp_nbr.py index 68436177d8..9f01287c91 100644 --- a/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_ibgp_nbr.py +++ b/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_ibgp_nbr.py @@ -56,6 +56,9 @@ from lib.bgp import ( ) from lib.topojson import build_config_from_json + +pytestmark = [pytest.mark.bgpd, pytest.mark.staticd] + # Global variables topo = None diff --git a/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_nbr.py b/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_nbr.py index 1d424caa30..48f308e316 100644 --- a/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_nbr.py +++ b/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_nbr.py @@ -55,6 +55,8 @@ from lib.bgp import ( ) from lib.topojson import build_config_from_json +pytestmark = [pytest.mark.bgpd, pytest.mark.staticd] + # Global variables topo = None diff --git a/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_unnumbered_nbr.py b/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_unnumbered_nbr.py index fc2d2364c6..4105c3fe63 100644 --- a/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_unnumbered_nbr.py +++ b/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_unnumbered_nbr.py @@ -52,6 +52,8 @@ from lib.bgp import create_router_bgp, verify_bgp_convergence, verify_bgp_rib from lib.topojson import build_config_from_json +pytestmark = [pytest.mark.bgpd, pytest.mark.staticd] + # Global variables topo = None diff --git a/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ibgp_nbr.py b/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ibgp_nbr.py index 862cae42e9..a9e6d21b8d 100644 --- a/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ibgp_nbr.py +++ b/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ibgp_nbr.py @@ -58,9 +58,10 @@ from lib.bgp import ( ) from lib.topojson import build_config_from_json +pytestmark = [pytest.mark.bgpd, pytest.mark.staticd] + # Global variables topo = None - # Global variables NETWORK = { "ipv4": [ diff --git a/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ibgp_unnumbered_nbr.py b/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ibgp_unnumbered_nbr.py index 1a91257f06..9a0fc44175 100644 --- a/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ibgp_unnumbered_nbr.py +++ b/tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ibgp_unnumbered_nbr.py @@ -54,6 +54,7 @@ from lib.topojson import build_config_from_json # Global variables topo = None +pytestmark = [pytest.mark.bgpd, pytest.mark.staticd] # Global variables NETWORK_CMD_IP = "1.0.1.17/32" diff --git a/tests/topotests/ospf_gr_helper/test_ospf_gr_helper1.py b/tests/topotests/ospf_gr_helper/test_ospf_gr_helper1.py index 8c855620be..58d37a368c 100644 --- a/tests/topotests/ospf_gr_helper/test_ospf_gr_helper1.py +++ b/tests/topotests/ospf_gr_helper/test_ospf_gr_helper1.py @@ -57,6 +57,8 @@ from lib.ospf import ( create_router_ospf, ) +pytestmark = [pytest.mark.ospfd] + # Global variables topo = None Iters = 5 diff --git a/tests/topotests/ospf_gr_helper/test_ospf_gr_helper2.py b/tests/topotests/ospf_gr_helper/test_ospf_gr_helper2.py index e7d0621df8..85646a8fab 100644 --- a/tests/topotests/ospf_gr_helper/test_ospf_gr_helper2.py +++ b/tests/topotests/ospf_gr_helper/test_ospf_gr_helper2.py @@ -57,6 +57,8 @@ from lib.ospf import ( create_router_ospf, ) +pytestmark = [pytest.mark.ospfd] + # Global variables topo = None Iters = 5 diff --git a/tests/topotests/ospf_gr_helper/test_ospf_gr_helper3.py b/tests/topotests/ospf_gr_helper/test_ospf_gr_helper3.py index 4cb3747c56..ec97c254d1 100644 --- a/tests/topotests/ospf_gr_helper/test_ospf_gr_helper3.py +++ b/tests/topotests/ospf_gr_helper/test_ospf_gr_helper3.py @@ -57,6 +57,8 @@ from lib.ospf import ( create_router_ospf, ) +pytestmark = [pytest.mark.ospfd] + # Global variables topo = None Iters = 5 diff --git a/tests/topotests/ospfv3_basic_functionality/test_ospfv3_asbr_summary_topo1.py b/tests/topotests/ospfv3_basic_functionality/test_ospfv3_asbr_summary_topo1.py index 3967f5f42a..59ba8236c7 100644 --- a/tests/topotests/ospfv3_basic_functionality/test_ospfv3_asbr_summary_topo1.py +++ b/tests/topotests/ospfv3_basic_functionality/test_ospfv3_asbr_summary_topo1.py @@ -68,6 +68,7 @@ from lib.ospf import ( verify_ospf_summary, ) +pytestmark = [pytest.mark.ospfd, pytest.mark.staticd] # Global variables topo = None