diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2025-01-16 08:11:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-16 08:11:25 +0100 |
| commit | 4e363bd48d5b8e3e5b25b4eb2662b626e0baa0f7 (patch) | |
| tree | 03c6133881db0b639c3d7b0edca61265ae7fec8c | |
| parent | Merge pull request #17838 from opensourcerouting/msdp-topo3 (diff) | |
| parent | tests: dont run ldp snmp test if no snmp (diff) | |
| download | frr-4e363bd48d5b8e3e5b25b4eb2662b626e0baa0f7.tar.xz frr-4e363bd48d5b8e3e5b25b4eb2662b626e0baa0f7.zip | |
Merge pull request #17862 from LabNConsulting/chopps/ldp-snmp-fix
ldp snmp/grpc test fix
| -rw-r--r-- | tests/topotests/grpc_basic/test_basic_grpc.py | 9 | ||||
| -rw-r--r-- | tests/topotests/ldp_snmp/test_ldp_snmp_topo1.py | 5 |
2 files changed, 7 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": {} } } """ ) 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() |