From b0f9c4d68849b2545ba54e4e67513b748257d1cc Mon Sep 17 00:00:00 2001 From: Christian Hopps Date: Thu, 16 Jan 2025 01:09:14 +0000 Subject: tests: fix missed grpc test requirement for frr-backend addition Signed-off-by: Christian Hopps --- tests/topotests/grpc_basic/test_basic_grpc.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/topotests/grpc_basic/test_basic_grpc.py b/tests/topotests/grpc_basic/test_basic_grpc.py index 5ff2894fd..e82436c39 100644 --- a/tests/topotests/grpc_basic/test_basic_grpc.py +++ b/tests/topotests/grpc_basic/test_basic_grpc.py @@ -108,7 +108,7 @@ def test_capabilities(tgen): logging.debug("grpc output: %s", output) modules = sorted(re.findall('name: "([^"]+)"', output)) - expected = ["frr-interface", "frr-routing", "frr-staticd", "frr-vrf"] + expected = ["frr-backend", "frr-interface", "frr-routing", "frr-staticd", "frr-vrf"] assert modules == expected encodings = sorted(re.findall("supported_encodings: (.*)", output)) @@ -145,15 +145,10 @@ def test_get_config(tgen): "ip": "192.168.1.1", "prefix-length": 24 } - ], - "evpn-mh": {}, - "ipv6-router-advertisements": {} + ] } } ] - }, - "frr-zebra:zebra": { - "import-kernel-table": {} } } """ ) -- cgit v1.2.3 From f71d5281ceddf67cdbbc88d8605bc3e9c24136ef Mon Sep 17 00:00:00 2001 From: Christian Hopps Date: Thu, 16 Jan 2025 01:07:53 +0000 Subject: tests: dont run ldp snmp test if no snmp Signed-off-by: Christian Hopps --- tests/topotests/ldp_snmp/test_ldp_snmp_topo1.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/topotests/ldp_snmp/test_ldp_snmp_topo1.py b/tests/topotests/ldp_snmp/test_ldp_snmp_topo1.py index ea404beae..db2657e52 100644 --- a/tests/topotests/ldp_snmp/test_ldp_snmp_topo1.py +++ b/tests/topotests/ldp_snmp/test_ldp_snmp_topo1.py @@ -107,6 +107,11 @@ def build_topo(tgen): def setup_module(mod): "Sets up the pytest environment" + + if not os.path.isfile("/usr/sbin/snmpd"): + error_msg = "SNMP not installed - skipping" + pytest.skip(error_msg) + tgen = Topogen(build_topo, mod.__name__) tgen.start_topology() -- cgit v1.2.3