From 8e957dbb044532b43321ab22171fdff97a59d70d Mon Sep 17 00:00:00 2001 From: Martin Winter Date: Wed, 30 Aug 2017 17:03:54 -0700 Subject: [PATCH] multiple_topos: Don't report about StdErr Output if there is no output Signed-off-by: Martin Winter --- .../test_all_protocol_startup.py | 24 ++++++++++++------- .../test_bgp_multiview_topo1.py | 6 +++-- .../topotests/eigrp-topo1/test_eigrp_topo1.py | 6 +++-- tests/topotests/ldp-topo1/test_ldp_topo1.py | 9 ++++--- .../topotests/ospf6-topo1/test_ospf6_topo1.py | 6 +++-- tests/topotests/rip-topo1/test_rip_topo1.py | 6 +++-- .../topotests/ripng-topo1/test_ripng_topo1.py | 6 +++-- 7 files changed, 42 insertions(+), 21 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 083505349f..c01b770b40 100755 --- a/tests/topotests/all-protocol-startup/test_all_protocol_startup.py +++ b/tests/topotests/all-protocol-startup/test_all_protocol_startup.py @@ -876,22 +876,30 @@ def test_shutdown_check_stderr(): net['r1'].stopRouter() log = net['r1'].getStdErr('ripd') - print("\nRIPd StdErr Log:\n" + log) + if log: + print("\nRIPd StdErr Log:\n" + log) log = net['r1'].getStdErr('ripngd') - print("\nRIPngd StdErr Log:\n" + log) + if log: + print("\nRIPngd StdErr Log:\n" + log) log = net['r1'].getStdErr('ospfd') - print("\nOSPFd StdErr Log:\n" + log) + if log: + print("\nOSPFd StdErr Log:\n" + log) log = net['r1'].getStdErr('ospf6d') - print("\nOSPF6d StdErr Log:\n" + log) + if log: + print("\nOSPF6d StdErr Log:\n" + log) log = net['r1'].getStdErr('isisd') - print("\nISISd StdErr Log:\n" + log) + if log: + print("\nISISd StdErr Log:\n" + log) log = net['r1'].getStdErr('bgpd') - print("\nBGPd StdErr Log:\n" + log) + if log: + print("\nBGPd StdErr Log:\n" + log) if (net['r1'].daemon_available('ldpd')): log = net['r1'].getStdErr('ldpd') - print("\nLDPd StdErr Log:\n" + log) + if log: + print("\nLDPd StdErr Log:\n" + log) log = net['r1'].getStdErr('zebra') - print("\nZebra StdErr Log:\n" + log) + if log: + print("\nZebra StdErr Log:\n" + log) def test_shutdown_check_memleak(): 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 d850787fa4..f2fb4d7932 100755 --- a/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py +++ b/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py @@ -339,9 +339,11 @@ def test_shutdown_check_stderr(): net['r1'].stopRouter() log = net['r1'].getStdErr('bgpd') - print("\nBGPd StdErr Log:\n" + log) + if log: + print("\nBGPd StdErr Log:\n" + log) log = net['r1'].getStdErr('zebra') - print("\nZebra StdErr Log:\n" + log) + if log: + print("\nZebra StdErr Log:\n" + log) def test_shutdown_check_memleak(): diff --git a/tests/topotests/eigrp-topo1/test_eigrp_topo1.py b/tests/topotests/eigrp-topo1/test_eigrp_topo1.py index 39917257a3..e50261b070 100755 --- a/tests/topotests/eigrp-topo1/test_eigrp_topo1.py +++ b/tests/topotests/eigrp-topo1/test_eigrp_topo1.py @@ -218,9 +218,11 @@ def test_shutdown_check_stderr(): router.stop() log = tgen.net[router.name].getStdErr('eigrpd') - logger.error('EIGRPd StdErr Log:' + log) + if log: + logger.error('EIGRPd StdErr Log:' + log) log = tgen.net[router.name].getStdErr('zebra') - logger.error('Zebra StdErr Log:' + log) + if log: + logger.error('Zebra StdErr Log:' + log) if __name__ == '__main__': diff --git a/tests/topotests/ldp-topo1/test_ldp_topo1.py b/tests/topotests/ldp-topo1/test_ldp_topo1.py index 1cb9aa7377..e5545bce2b 100755 --- a/tests/topotests/ldp-topo1/test_ldp_topo1.py +++ b/tests/topotests/ldp-topo1/test_ldp_topo1.py @@ -785,11 +785,14 @@ def test_shutdown_check_stderr(): for i in range(1, 5): net['r%s' % i].stopRouter() log = net['r%s' % i].getStdErr('ldpd') - print("\nRouter r%s LDPd StdErr Log:\n%s" % (i, log)) + if log: + print("\nRouter r%s LDPd StdErr Log:\n%s" % (i, log)) log = net['r%s' % i].getStdErr('ospfd') - print("\nRouter r%s OSPFd StdErr Log:\n%s" % (i, log)) + if log: + print("\nRouter r%s OSPFd StdErr Log:\n%s" % (i, log)) log = net['r%s' % i].getStdErr('zebra') - print("\nRouter r%s Zebra StdErr Log:\n%s" % (i, log)) + if log: + print("\nRouter r%s Zebra StdErr Log:\n%s" % (i, log)) def test_shutdown_check_memleak(): diff --git a/tests/topotests/ospf6-topo1/test_ospf6_topo1.py b/tests/topotests/ospf6-topo1/test_ospf6_topo1.py index f72a8082e3..2c49dff23b 100755 --- a/tests/topotests/ospf6-topo1/test_ospf6_topo1.py +++ b/tests/topotests/ospf6-topo1/test_ospf6_topo1.py @@ -386,9 +386,11 @@ def test_shutdown_check_stderr(): for i in range(1, 5): net['r%s' % i].stopRouter() log = net['r%s' % i].getStdErr('ospf6d') - print("\nRouter r%s OSPF6d StdErr Log:\n%s" % (i, log)) + if log: + print("\nRouter r%s OSPF6d StdErr Log:\n%s" % (i, log)) log = net['r%s' % i].getStdErr('zebra') - print("\nRouter r%s Zebra StdErr Log:\n%s" % (i, log)) + if log: + print("\nRouter r%s Zebra StdErr Log:\n%s" % (i, log)) def test_shutdown_check_memleak(): diff --git a/tests/topotests/rip-topo1/test_rip_topo1.py b/tests/topotests/rip-topo1/test_rip_topo1.py index 44be48c702..7aaaacacfb 100755 --- a/tests/topotests/rip-topo1/test_rip_topo1.py +++ b/tests/topotests/rip-topo1/test_rip_topo1.py @@ -357,9 +357,11 @@ def test_shutdown_check_stderr(): net['r1'].stopRouter() log = net['r1'].getStdErr('ripd') - print("\nRIPd StdErr Log:\n" + log) + if log: + print("\nRIPd StdErr Log:\n" + log) log = net['r1'].getStdErr('zebra') - print("\nZebra StdErr Log:\n" + log) + if log: + print("\nZebra StdErr Log:\n" + log) if __name__ == '__main__': diff --git a/tests/topotests/ripng-topo1/test_ripng_topo1.py b/tests/topotests/ripng-topo1/test_ripng_topo1.py index 518f4e13e6..145b1a7efe 100755 --- a/tests/topotests/ripng-topo1/test_ripng_topo1.py +++ b/tests/topotests/ripng-topo1/test_ripng_topo1.py @@ -368,9 +368,11 @@ def test_shutdown_check_stderr(): net['r1'].stopRouter() log = net['r1'].getStdErr('ripngd') - print("\nRIPngd StdErr Log:\n" + log) + if log: + print("\nRIPngd StdErr Log:\n" + log) log = net['r1'].getStdErr('zebra') - print("\nZebra StdErr Log:\n" + log) + if log: + print("\nZebra StdErr Log:\n" + log) def test_shutdown_check_memleak(): -- 2.39.5