summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Stapp <mjs@voltanet.io>2020-08-25 10:50:12 -0400
committerMark Stapp <mjs@voltanet.io>2020-08-25 10:50:12 -0400
commitaf39fbe7df83ae3c84c08bbbb29d0f1fa196a51c (patch)
tree08cc42107cd7dabee1e8b01a5100ebb565762e4b
parent310451ba9712f2d4483bd976a968cd4b6d19477f (diff)
tests: include all daemons in all-proto error tests
Some daemons run in all-protocol-startup weren't included in error-output testing. Signed-off-by: Mark Stapp <mjs@voltanet.io>
-rwxr-xr-xtests/topotests/all-protocol-startup/test_all_protocol_startup.py29
1 files changed, 29 insertions, 0 deletions
diff --git a/tests/topotests/all-protocol-startup/test_all_protocol_startup.py b/tests/topotests/all-protocol-startup/test_all_protocol_startup.py
index 4602b039a6..8525838d96 100755
--- a/tests/topotests/all-protocol-startup/test_all_protocol_startup.py
+++ b/tests/topotests/all-protocol-startup/test_all_protocol_startup.py
@@ -263,6 +263,22 @@ def test_error_messages_daemons():
if log:
error_logs += "r%s LDPd StdErr Output:\n" % i
error_logs += log
+
+ log = net['r1'].getStdErr('nhrpd')
+ if log:
+ error_logs += "r%s NHRPd StdErr Output:\n" % i
+ error_logs += log
+
+ log = net['r1'].getStdErr('babeld')
+ if log:
+ error_logs += "r%s BABELd StdErr Output:\n" % i
+ error_logs += log
+
+ log = net['r1'].getStdErr('pbrd')
+ if log:
+ error_logs += "r%s PBRd StdErr Output:\n" % i
+ error_logs += log
+
log = net['r%s' % i].getStdErr('zebra')
if log:
error_logs += "r%s Zebra StdErr Output:\n"
@@ -1182,6 +1198,19 @@ def test_shutdown_check_stderr():
log = net['r1'].getStdErr('bgpd')
if log:
print("\nBGPd StdErr Log:\n" + log)
+
+ log = net['r1'].getStdErr('nhrpd')
+ if log:
+ print("\nNHRPd StdErr Log:\n" + log)
+
+ log = net['r1'].getStdErr('pbrd')
+ if log:
+ print("\nPBRd StdErr Log:\n" + log)
+
+ log = net['r1'].getStdErr('babeld')
+ if log:
+ print("\nBABELd StdErr Log:\n" + log)
+
if (net['r1'].daemon_available('ldpd')):
log = net['r1'].getStdErr('ldpd')
if log: