tests: remove deprecated debug cli from some tests

Some tests had commented-out references to the old "CLI()"
function. Remove those so they're not confusing in the future,
and replace at least one with a comment that uses the
'mininet_cli()' function.

Signed-off-by: Mark Stapp <mstapp@nvidia.com>
This commit is contained in:
Mark Stapp 2021-10-06 10:51:04 -04:00
parent 5b9414484c
commit a1985a2dc9
3 changed files with 3 additions and 57 deletions

View File

@ -126,7 +126,7 @@ def setup_module(module):
tgen.gears["r%s" % i].start()
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
# tgen.mininet_cli()
def teardown_module(module):
@ -153,9 +153,6 @@ def test_router_running():
fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_mpls_interfaces():
global fatal_error
@ -219,9 +216,6 @@ def test_mpls_interfaces():
fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_mpls_ldp_neighbor_establish():
global fatal_error
@ -356,9 +350,6 @@ def test_mpls_ldp_discovery():
fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_mpls_ldp_neighbor():
global fatal_error
@ -426,9 +417,6 @@ def test_mpls_ldp_neighbor():
fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_mpls_ldp_binding():
global fatal_error
@ -518,9 +506,6 @@ def test_mpls_ldp_binding():
fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_zebra_ipv4_routingTable():
global fatal_error
@ -595,9 +580,6 @@ def test_zebra_ipv4_routingTable():
fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_mpls_table():
global fatal_error
@ -674,9 +656,6 @@ def test_mpls_table():
fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_linux_mpls_routes():
global fatal_error
@ -758,9 +737,6 @@ def test_linux_mpls_routes():
fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_shutdown_check_stderr():
global fatal_error

View File

@ -108,7 +108,7 @@ def setup_module(module):
tgen.gears["r%s" % i].start()
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
# tgen.mininet_cli()
def teardown_module(module):
@ -134,9 +134,6 @@ def test_router_running():
fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_converge_protocols():
global fatal_error
@ -159,9 +156,6 @@ def test_converge_protocols():
fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_rip_status():
global fatal_error
@ -220,9 +214,6 @@ def test_rip_status():
fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_rip_routes():
global fatal_error
@ -275,9 +266,6 @@ def test_rip_routes():
fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_zebra_ipv4_routingTable():
global fatal_error
@ -341,9 +329,6 @@ def test_zebra_ipv4_routingTable():
fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_shutdown_check_stderr():
global fatal_error

View File

@ -104,7 +104,7 @@ def setup_module(module):
tgen.gears["r%s" % i].start()
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
# tgen.mininet_cli()
def teardown_module(module):
@ -130,9 +130,6 @@ def test_router_running():
fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_converge_protocols():
global fatal_error
@ -155,9 +152,6 @@ def test_converge_protocols():
fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_ripng_status():
global fatal_error
@ -223,9 +217,6 @@ def test_ripng_status():
fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_ripng_routes():
global fatal_error
@ -290,9 +281,6 @@ def test_ripng_routes():
fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_zebra_ipv6_routingTable():
global fatal_error
@ -358,9 +346,6 @@ def test_zebra_ipv6_routingTable():
fatal_error = net["r%s" % i].checkRouterRunning()
assert fatal_error == "", fatal_error
# For debugging after starting FRR daemons, uncomment the next line
# CLI(net)
def test_shutdown_check_stderr():
global fatal_error