topotato: make RIP tests a bit more tolerant

Some whitespace changed between versions. Also the ECMP test needs the CLI command to exist. Signed-off-by: David Lamparter <[email protected]>
opensourcerouting · Oct 1, 2024 · 14ac4d5 · 14ac4d5
1 parent a60c01d
commit 14ac4d5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/test_rip.py b/test_rip.py
@@ -114,7 +114,7 @@ def test(self, topo, r1, r2, r3, rtsta):
                 r1-stub3
               Routing Information Sources:
                 Gateway          BadPackets BadRoutes  Distance Last Update
-                193.1.1.2                 0         0       120    $$[0-9:]+$$
+                193.1.1.2 $$\s*$$ 0         0       120 $$\s*[0-9:]+$$
               Distance: (default is 120)
         """
         yield from AssertVtysh.make(
@@ -138,8 +138,8 @@ def test(self, topo, r1, r2, r3, rtsta):
                 193.1.2.0/24
               Routing Information Sources:
                 Gateway          BadPackets BadRoutes  Distance Last Update
-                193.1.1.1                 0         0       120    $$[0-9:]+$$
-                193.1.2.3                 0         0       120    $$[0-9:]+$$
+                193.1.1.1 $$\s*$$ 0         0       120 $$\s*[0-9:]+$$
+                193.1.2.3 $$\s*$$ 0         0       120 $$\s*[0-9:]+$$
               Distance: (default is 120)
         """
         yield from AssertVtysh.make(
@@ -161,7 +161,7 @@ def test(self, topo, r1, r2, r3, rtsta):
                 193.1.2.0/24
               Routing Information Sources:
                 Gateway          BadPackets BadRoutes  Distance Last Update
-                193.1.2.2                 0         0       120    $$[0-9:]+$$
+                193.1.2.2 $$\s*$$ 0         0       120 $$\s*[0-9:]+$$
               Distance: (default is 120)
         """
         yield from AssertVtysh.make(

diff --git a/test_rip_allow_ecmp.py b/test_rip_allow_ecmp.py
@@ -49,6 +49,9 @@ class Configs(FRRConfigs):
     #% endblock
     """
 
+    def requirements(self):
+        self.require_defun("rip_allow_ecmp_cmd", "MULTIPATH_NUM")
+
 
 class RIPAllowECMP(TestBase, AutoFixture, topo=topology, configs=Configs):
     def ecmp_nexthops(self, *routers):