summaryrefslogtreecommitdiff
path: root/tests/topotests/mgmt_oper/test_simple.py
diff options
context:
space:
mode:
authorChristian Hopps <chopps@labn.net>2024-11-24 03:06:05 -0500
committerChristian Hopps <chopps@labn.net>2024-12-24 03:04:23 -0500
commit3d3ee2a1afbae9ea00483223af6de42d19653e3b (patch)
tree59b6904ffdc9e8328681e51d92c4f954b5198b9c /tests/topotests/mgmt_oper/test_simple.py
parenta1fb05159004aa061ed0c7fb727ea1872f695812 (diff)
tests: enable failure and fix broken tests
This test was not actually failing when the results didn't match. Fail now. Also fix the tests that are now found to be failing incorrectly (wrong expected result). Signed-off-by: Christian Hopps <chopps@labn.net>
Diffstat (limited to 'tests/topotests/mgmt_oper/test_simple.py')
-rw-r--r--tests/topotests/mgmt_oper/test_simple.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/topotests/mgmt_oper/test_simple.py b/tests/topotests/mgmt_oper/test_simple.py
index 2b3d6ff6a5..237f7d57d5 100644
--- a/tests/topotests/mgmt_oper/test_simple.py
+++ b/tests/topotests/mgmt_oper/test_simple.py
@@ -154,7 +154,11 @@ def test_oper_simple(tgen):
),
(
'/frr-interface:lib/interface[name="r1-eth0"]/frr-zebra:zebra/evpn-mh',
- "simple-results/result-intf-eth0-wd-trim.json",
+ (
+ # Output is different between libyang2 and libyang3+
+ "simple-results/result-intf-eth0-wd-trim.json",
+ "simple-results/result-intf-eth0-wd-trim-empty-label.json",
+ ),
"with-config exact with-defaults trim",
),
(
@@ -181,7 +185,7 @@ vtysh -c 'show mgmt get-data /frr-vrf:lib' > ${resdir}/result-lib.json
vtysh -c 'show mgmt get-data /frr-vrf:lib/vrf' > ${resdir}/result-lib-vrf-nokey.json
vtysh -c 'show mgmt get-data /frr-vrf:lib/vrf[name="default"]' > ${resdir}/result-lib-vrf-default.json
vtysh -c 'show mgmt get-data /frr-vrf:lib/vrf[name="red"]' > ${resdir}/result-lib-vrf-red.json
-vtysh -c 'show mgmt get-data /frr-vrf:lib/vrf[name="default"]/frr-zebra:zebra' > ${resdir}/result-lib-vrf-ebra.json
+vtysh -c 'show mgmt get-data /frr-vrf:lib/vrf[name="default"]/frr-zebra:zebra' > ${resdir}/result-lib-vrf-zebra.json
vtysh -c 'show mgmt get-data /frr-vrf:lib/vrf[name="default"]/frr-zebra:zebra/ribs' > ${resdir}/result-lib-vrf-zebra-ribs.json
vtysh -c 'show mgmt get-data /frr-vrf:lib/vrf[name="default"]/frr-zebra:zebra/ribs/rib' > ${resdir}/result-ribs-rib-nokeys.json
vtysh -c 'show mgmt get-data /frr-vrf:lib/vrf[name="default"]/frr-zebra:zebra/ribs/rib[afi-safi-name="frr-routing:ipv4-unicast"][table-id="254"]' > ${resdir}/result-ribs-rib-ipv4-unicast.json