proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-12 12:53:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

multiple_topos: Don't report about StdErr Output if there is no output

Browse Source 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
This commit is contained in:
Martin Winter 2017-08-30 17:03:54 -07:00 committed by Donald Sharp
parent 9057cd2cc3
commit 8e957dbb04
7 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/topotests/all-protocol-startup/test_all_protocol_startup.py
View File

@ -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():

6
tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py
View File

@ -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():

6
tests/topotests/eigrp-topo1/test_eigrp_topo1.py
View File

@ -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__':

9
tests/topotests/ldp-topo1/test_ldp_topo1.py
View File

@ -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():

6
tests/topotests/ospf6-topo1/test_ospf6_topo1.py
View File

@ -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():

6
tests/topotests/rip-topo1/test_rip_topo1.py
View File

@ -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__':

6
tests/topotests/ripng-topo1/test_ripng_topo1.py
View File

@ -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():