summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorOlivier Dugeon <olivier.dugeon@orange.com>2018-12-04 18:33:36 +0100
committerGitHub <noreply@github.com>2018-12-04 18:33:36 +0100
commit58980443821edf95719984e01f31720bd1dc7f79 (patch)
treec840c0f10bd13613c795f7f9c572eac34953e0d6 /tests
parentMerge pull request #3410 from opensourcerouting/bugfix/topotest-docker-build-... (diff)
parenttopotests: Update json_cmp_result to return readable result (diff)
downloadfrr-58980443821edf95719984e01f31720bd1dc7f79.tar.xz
frr-58980443821edf95719984e01f31720bd1dc7f79.zip
Merge pull request #3174 from opensourcerouting/feature/isis-triggered-hello
Feature: IS-IS triggered hello
Diffstat (limited to 'tests')
-rw-r--r--tests/topotests/isis-topo1/r1/isisd.conf3
-rw-r--r--tests/topotests/isis-topo1/r2/isisd.conf3
-rw-r--r--tests/topotests/isis-topo1/r3/isisd.conf3
-rw-r--r--tests/topotests/isis-topo1/r4/isisd.conf3
-rw-r--r--tests/topotests/isis-topo1/r5/isisd.conf3
-rw-r--r--tests/topotests/lib/topotest.py3
6 files changed, 18 insertions, 0 deletions
diff --git a/tests/topotests/isis-topo1/r1/isisd.conf b/tests/topotests/isis-topo1/r1/isisd.conf
index 990821d29..ee7dba369 100644
--- a/tests/topotests/isis-topo1/r1/isisd.conf
+++ b/tests/topotests/isis-topo1/r1/isisd.conf
@@ -1,4 +1,7 @@
hostname r1
+debug isis adj-packets
+debug isis events
+debug isis update-packets
interface r1-eth0
ip router isis 1
ipv6 router isis 1
diff --git a/tests/topotests/isis-topo1/r2/isisd.conf b/tests/topotests/isis-topo1/r2/isisd.conf
index bcccc0882..f6fee6c84 100644
--- a/tests/topotests/isis-topo1/r2/isisd.conf
+++ b/tests/topotests/isis-topo1/r2/isisd.conf
@@ -1,4 +1,7 @@
hostname r2
+debug isis adj-packets
+debug isis events
+debug isis update-packets
interface r2-eth0
ip router isis 1
ipv6 router isis 1
diff --git a/tests/topotests/isis-topo1/r3/isisd.conf b/tests/topotests/isis-topo1/r3/isisd.conf
index c3c3e5001..4ae56b4af 100644
--- a/tests/topotests/isis-topo1/r3/isisd.conf
+++ b/tests/topotests/isis-topo1/r3/isisd.conf
@@ -1,4 +1,7 @@
hostname r3
+debug isis adj-packets
+debug isis events
+debug isis update-packets
interface r3-eth0
ip router isis 1
ipv6 router isis 1
diff --git a/tests/topotests/isis-topo1/r4/isisd.conf b/tests/topotests/isis-topo1/r4/isisd.conf
index 405802ed5..bf9653387 100644
--- a/tests/topotests/isis-topo1/r4/isisd.conf
+++ b/tests/topotests/isis-topo1/r4/isisd.conf
@@ -1,4 +1,7 @@
hostname r4
+debug isis adj-packets
+debug isis events
+debug isis update-packets
interface r4-eth0
ip router isis 1
ipv6 router isis 1
diff --git a/tests/topotests/isis-topo1/r5/isisd.conf b/tests/topotests/isis-topo1/r5/isisd.conf
index 0a8f32533..5a044988a 100644
--- a/tests/topotests/isis-topo1/r5/isisd.conf
+++ b/tests/topotests/isis-topo1/r5/isisd.conf
@@ -1,4 +1,7 @@
hostname r5
+debug isis adj-packets
+debug isis events
+debug isis update-packets
interface r5-eth0
ip router isis 1
ipv6 router isis 1
diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py
index 1bdf8b10d..f25b06628 100644
--- a/tests/topotests/lib/topotest.py
+++ b/tests/topotests/lib/topotest.py
@@ -60,6 +60,9 @@ class json_cmp_result(object):
"Returns True if there were errors, otherwise False."
return len(self.errors) > 0
+ def __str__(self):
+ return '\n'.join(self.errors)
+
def get_test_logdir(node=None, init=False):
"""
Return the current test log directory based on PYTEST_CURRENT_TEST