From 4aaea8fb4941582039a2c024c0d04e4a391558fd Mon Sep 17 00:00:00 2001 From: Stephen Worley Date: Fri, 14 Jun 2019 14:13:22 -0400 Subject: [PATCH] tests: Make checkRouterRunning() `show logging` Adding in the command `show log-filter` made `show log` ambiguous. Change the checkRouterRunning() test to do full `show logging` so it works again. Signed-off-by: Stephen Worley --- tests/topotests/bgp_multiview_topo1/README.md | 2 +- tests/topotests/lib/topotest.py | 2 +- tests/topotests/ospf6-topo1/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/topotests/bgp_multiview_topo1/README.md b/tests/topotests/bgp_multiview_topo1/README.md index b9982d490..60b328505 100644 --- a/tests/topotests/bgp_multiview_topo1/README.md +++ b/tests/topotests/bgp_multiview_topo1/README.md @@ -96,7 +96,7 @@ Simplified `R1` config: Test is executed by running - vtysh -c "show log" | grep "Logging configuration for" + vtysh -c "show logging" | grep "Logging configuration for" on router `R1`. This should return the logging information for all daemons registered to Zebra and the list of running daemons is compared to the daemons started for this diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py index 86993665c..867f9f2f0 100644 --- a/tests/topotests/lib/topotest.py +++ b/tests/topotests/lib/topotest.py @@ -959,7 +959,7 @@ class Router(Node): global fatal_error - daemonsRunning = self.cmd('vtysh -c "show log" | grep "Logging configuration for"') + daemonsRunning = self.cmd('vtysh -c "show logging" | grep "Logging configuration for"') # Look for AddressSanitizer Errors in vtysh output and append to /tmp/AddressSanitzer.txt if found if checkAddressSanitizerError(daemonsRunning, self.name, "vtysh"): return "%s: vtysh killed by AddressSanitizer" % (self.name) diff --git a/tests/topotests/ospf6-topo1/README.md b/tests/topotests/ospf6-topo1/README.md index 28f68e8fa..526c019c6 100644 --- a/tests/topotests/ospf6-topo1/README.md +++ b/tests/topotests/ospf6-topo1/README.md @@ -102,7 +102,7 @@ Simplified `R3` config Test is executed by running - vtysh -c "show log" | grep "Logging configuration for" + vtysh -c "show logging" | grep "Logging configuration for" on each FRR router. This should return the logging information for all daemons registered to Zebra and the list of running daemons is compared to the daemons started for this test (`zebra` and `ospf6d`) -- 2.39.2