From 3914e5759177b1914b31f09cb091d405df1f257a Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 15 Jan 2021 09:17:53 -0500 Subject: [PATCH] tests: Add `pytest.mark.isis` Add a mark to topotests that mark isis tests `pytest -k isis` Signed-off-by: Donald Sharp --- .../topotests/all-protocol-startup/test_all_protocol_startup.py | 1 + tests/topotests/bfd-isis-topo1/test_bfd_isis_topo1.py | 1 + tests/topotests/bfd-profiles-topo1/test_bfd_profiles_topo1.py | 1 + tests/topotests/isis-lfa-topo1/test_isis_lfa_topo1.py | 2 +- tests/topotests/isis-rlfa-topo1/test_isis_rlfa_topo1.py | 2 +- tests/topotests/isis-sr-te-topo1/test_isis_sr_te_topo1.py | 1 + tests/topotests/isis-sr-topo1/test_isis_sr_topo1.py | 2 +- tests/topotests/isis-tilfa-topo1/test_isis_tilfa_topo1.py | 2 +- tests/topotests/isis-topo1-vrf/test_isis_topo1_vrf.py | 2 +- tests/topotests/isis-topo1/test_isis_topo1.py | 2 +- tests/topotests/pytest.ini | 1 + 11 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tests/topotests/all-protocol-startup/test_all_protocol_startup.py b/tests/topotests/all-protocol-startup/test_all_protocol_startup.py index 41fa1b2732..24bef07ec2 100644 --- a/tests/topotests/all-protocol-startup/test_all_protocol_startup.py +++ b/tests/topotests/all-protocol-startup/test_all_protocol_startup.py @@ -82,6 +82,7 @@ class NetworkTopo(Topo): ## ##################################################### +@pytest.mark.isis @pytest.mark.ospf @pytest.mark.rip def setup_module(module): diff --git a/tests/topotests/bfd-isis-topo1/test_bfd_isis_topo1.py b/tests/topotests/bfd-isis-topo1/test_bfd_isis_topo1.py index 92c1b1f147..23da7ed850 100644 --- a/tests/topotests/bfd-isis-topo1/test_bfd_isis_topo1.py +++ b/tests/topotests/bfd-isis-topo1/test_bfd_isis_topo1.py @@ -128,6 +128,7 @@ class TemplateTopo(Topo): switch.add_link(tgen.gears["rt5"], nodeif="eth-rt4") @pytest.mark.bfd +@pytest.mark.isis def setup_module(mod): "Sets up the pytest environment" tgen = Topogen(TemplateTopo, mod.__name__) diff --git a/tests/topotests/bfd-profiles-topo1/test_bfd_profiles_topo1.py b/tests/topotests/bfd-profiles-topo1/test_bfd_profiles_topo1.py index 97c9c93440..6283f03ddf 100644 --- a/tests/topotests/bfd-profiles-topo1/test_bfd_profiles_topo1.py +++ b/tests/topotests/bfd-profiles-topo1/test_bfd_profiles_topo1.py @@ -78,6 +78,7 @@ class BFDProfTopo(Topo): switch.add_link(tgen.gears["r6"]) @pytest.mark.bfd +@pytest.mark.isis def setup_module(mod): "Sets up the pytest environment" tgen = Topogen(BFDProfTopo, mod.__name__) diff --git a/tests/topotests/isis-lfa-topo1/test_isis_lfa_topo1.py b/tests/topotests/isis-lfa-topo1/test_isis_lfa_topo1.py index 6f80ffd1aa..a655b418cf 100755 --- a/tests/topotests/isis-lfa-topo1/test_isis_lfa_topo1.py +++ b/tests/topotests/isis-lfa-topo1/test_isis_lfa_topo1.py @@ -163,7 +163,7 @@ class TemplateTopo(Topo): f_in.close() f_out.close() - +@pytest.mark.isis def setup_module(mod): "Sets up the pytest environment" tgen = Topogen(TemplateTopo, mod.__name__) diff --git a/tests/topotests/isis-rlfa-topo1/test_isis_rlfa_topo1.py b/tests/topotests/isis-rlfa-topo1/test_isis_rlfa_topo1.py index 872fef8fdb..bb43e6b114 100755 --- a/tests/topotests/isis-rlfa-topo1/test_isis_rlfa_topo1.py +++ b/tests/topotests/isis-rlfa-topo1/test_isis_rlfa_topo1.py @@ -165,7 +165,7 @@ class TemplateTopo(Topo): f_in.close() f_out.close() - +@pytest.mark.isis def setup_module(mod): "Sets up the pytest environment" tgen = Topogen(TemplateTopo, mod.__name__) diff --git a/tests/topotests/isis-sr-te-topo1/test_isis_sr_te_topo1.py b/tests/topotests/isis-sr-te-topo1/test_isis_sr_te_topo1.py index b1071310cf..bfd2f92a28 100755 --- a/tests/topotests/isis-sr-te-topo1/test_isis_sr_te_topo1.py +++ b/tests/topotests/isis-sr-te-topo1/test_isis_sr_te_topo1.py @@ -148,6 +148,7 @@ class TemplateTopo(Topo): switch.add_link(tgen.gears['rt6'], nodeif="eth-dst") switch.add_link(tgen.gears['dst'], nodeif="eth-rt6") +@pytest.mark.isis def setup_module(mod): "Sets up the pytest environment" diff --git a/tests/topotests/isis-sr-topo1/test_isis_sr_topo1.py b/tests/topotests/isis-sr-topo1/test_isis_sr_topo1.py index 34eb6d90f6..63be3f78aa 100644 --- a/tests/topotests/isis-sr-topo1/test_isis_sr_topo1.py +++ b/tests/topotests/isis-sr-topo1/test_isis_sr_topo1.py @@ -134,7 +134,7 @@ class TemplateTopo(Topo): switch.add_link(tgen.gears["rt5"], nodeif="eth-rt6") switch.add_link(tgen.gears["rt6"], nodeif="eth-rt5") - +@pytest.mark.isis def setup_module(mod): "Sets up the pytest environment" tgen = Topogen(TemplateTopo, mod.__name__) diff --git a/tests/topotests/isis-tilfa-topo1/test_isis_tilfa_topo1.py b/tests/topotests/isis-tilfa-topo1/test_isis_tilfa_topo1.py index a1263de8ad..83751fabcd 100755 --- a/tests/topotests/isis-tilfa-topo1/test_isis_tilfa_topo1.py +++ b/tests/topotests/isis-tilfa-topo1/test_isis_tilfa_topo1.py @@ -177,7 +177,7 @@ class TemplateTopo(Topo): f_in.close() f_out.close() - +@pytest.mark.isis def setup_module(mod): "Sets up the pytest environment" tgen = Topogen(TemplateTopo, mod.__name__) diff --git a/tests/topotests/isis-topo1-vrf/test_isis_topo1_vrf.py b/tests/topotests/isis-topo1-vrf/test_isis_topo1_vrf.py index 12121e4ddf..a79c8a268b 100644 --- a/tests/topotests/isis-topo1-vrf/test_isis_topo1_vrf.py +++ b/tests/topotests/isis-topo1-vrf/test_isis_topo1_vrf.py @@ -82,7 +82,7 @@ class ISISTopo1(Topo): sw.add_link(tgen.gears["r4"]) sw.add_link(tgen.gears["r5"]) - +@pytest.mark.isis def setup_module(mod): "Sets up the pytest environment" tgen = Topogen(ISISTopo1, mod.__name__) diff --git a/tests/topotests/isis-topo1/test_isis_topo1.py b/tests/topotests/isis-topo1/test_isis_topo1.py index 71005a0362..25116d9452 100644 --- a/tests/topotests/isis-topo1/test_isis_topo1.py +++ b/tests/topotests/isis-topo1/test_isis_topo1.py @@ -84,7 +84,7 @@ class ISISTopo1(Topo): sw.add_link(tgen.gears["r4"]) sw.add_link(tgen.gears["r5"]) - +@pytest.mark.isis def setup_module(mod): "Sets up the pytest environment" tgen = Topogen(ISISTopo1, mod.__name__) diff --git a/tests/topotests/pytest.ini b/tests/topotests/pytest.ini index c57181c544..5918ea476a 100644 --- a/tests/topotests/pytest.ini +++ b/tests/topotests/pytest.ini @@ -5,6 +5,7 @@ markers = babel: Tests that run against BABEL bfd: Tests that run against BFDD eigrp: Tests that run against EIGRPD + isis: Tests that run against ISISD ldp: Tests that run against LDPD ospf: Tests that run against OSPF( v2 and v3 ) pim: Tests that run against pim -- 2.39.5