From: Rafael Zalamena <rzalamena@opensourcerouting.org>
Date: Wed, 20 Dec 2017 11:34:57 +0000 (-0200)
Subject: isis-topo1: skip test on FRR 2.0
X-Git-Tag: frr-7.1-dev~151^2~164
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=fc7752c118721d0a031375ae10dd6a561807dd1f;p=mirror%2Ffrr.git

isis-topo1: skip test on FRR 2.0

It was noticed that this topology doesn't converge when there are IPv6
configurations, so this commit makes the tests to be skipped when the
version is 2.X.Y.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org
---

diff --git a/tests/topotests/isis-topo1/test_isis_topo1.py b/tests/topotests/isis-topo1/test_isis_topo1.py
index 01d019a31c..f3685ab2a6 100644
--- a/tests/topotests/isis-topo1/test_isis_topo1.py
+++ b/tests/topotests/isis-topo1/test_isis_topo1.py
@@ -101,6 +101,15 @@ def setup_module(mod):
     # After loading the configurations, this function loads configured daemons.
     tgen.start_router()
 
+    has_version_20 = False
+    for router in tgen.routers().values():
+        if router.has_version('<', '3'):
+            has_version_20 = True
+
+    if has_version_20:
+        logger.info('Skipping ISIS tests for FRR 2.0')
+        tgen.set_error('ISIS has convergence problems with IPv6')
+
 
 def teardown_module(mod):
     "Teardown the pytest environment"