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 <sworley@cumulusnetworks.com>

diff --git a/tests/topotests/bgp_multiview_topo1/README.md b/tests/topotests/bgp_multiview_topo1/README.md
index b9982d4900f9f4230f386c8cdb4bdb3b9d9fde30..60b328505f4c24783f8c9ec286108dcf1f10e7d3 100644 (file)
--- 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 86993665ceadcd2fc69f7663a6badaee19584b02..867f9f2f0344fa501a6faaf5ace313f3a2e37870 100644 (file)
--- 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 28f68e8fa57664188ab5bc424ba1841e550692db..526c019c6acb8c410ed9ace94b3195e366b03eab 100644 (file)
--- 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`)