From: Martin Winter Date: Wed, 1 Feb 2017 16:01:32 +0000 (-0800) Subject: bgp_multiview_topo1: Mask out BGP Table version in comparison X-Git-Tag: frr-7.1-dev~151^2~352 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d98b7d6359392c79a135bbe00f1eb981403adeb6;p=matthieu%2Ffrr.git bgp_multiview_topo1: Mask out BGP Table version in comparison Signed-off-by: Martin Winter --- diff --git a/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_1.ref b/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_1.ref index 0e8bf842fd..6f1b1a1036 100644 --- a/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_1.ref +++ b/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_1.ref @@ -1,4 +1,4 @@ -BGP table version is 0, local router ID is 172.30.1.1 +BGP table version is XXX, local router ID is 172.30.1.1 Status codes: s suppressed, d damped, h history, * valid, > best, = multipath, i internal, r RIB-failure, S Stale, R Removed Origin codes: i - IGP, e - EGP, ? - incomplete diff --git a/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_2.ref b/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_2.ref index cfdbaeb99d..0230d25f53 100644 --- a/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_2.ref +++ b/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_2.ref @@ -1,4 +1,4 @@ -BGP table version is 0, local router ID is 172.30.1.1 +BGP table version is XXX, local router ID is 172.30.1.1 Status codes: s suppressed, d damped, h history, * valid, > best, = multipath, i internal, r RIB-failure, S Stale, R Removed Origin codes: i - IGP, e - EGP, ? - incomplete diff --git a/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_3.ref b/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_3.ref index f0f471db8e..b7e8c79d3c 100644 --- a/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_3.ref +++ b/tests/topotests/bgp_multiview_topo1/r1/show_ip_bgp_view_3.ref @@ -1,4 +1,4 @@ -BGP table version is 0, local router ID is 172.30.1.1 +BGP table version is XXX, local router ID is 172.30.1.1 Status codes: s suppressed, d damped, h history, * valid, > best, = multipath, i internal, r RIB-failure, S Stale, R Removed Origin codes: i - IGP, e - EGP, ? - incomplete diff --git a/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py b/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py index 9ada8422cc..3e548d6ff5 100755 --- a/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py +++ b/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py @@ -286,6 +286,8 @@ def test_bgp_routingTable(): actual = re.sub(r'Total number.*', '', actual) actual = re.sub(r'Displayed.*', '', actual) actual = actual.rstrip() + # Fix table version (ignore it) + actual = re.sub(r'(BGP table version is )[0-9]+', r'\1XXX', actual) # Fix newlines (make them all the same) actual = ('\n'.join(actual.splitlines()) + '\n').splitlines(1)