aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_vcl.py
diff options
context:
space:
mode:
authorPaul Vinciguerra <pvinci@vinciconsulting.com>2019-03-13 09:23:05 -0700
committerOle Trøan <otroan@employees.org>2019-04-11 07:23:11 +0000
commit90cf21b5d8fd2d3e531e841dcd752311df5f8a50 (patch)
tree36093100dca0c3ec70e199fc9648ca816fd5c628 /test/test_vcl.py
parent7c91007e1e13b56a29236bd076891709eaa21754 (diff)
Tests: Refactor tearDown show command logging, add lifecycle markers.
This change adds a consistent interface for adding test-specific show commands to log.txt. It also adds log markers for the execution of setUp[Class], tearDown[Class] in the logs. Change-Id: I7d42e396e594a59e866a7d55dac0af25548e657a Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
Diffstat (limited to 'test/test_vcl.py')
-rw-r--r--test/test_vcl.py28
1 files changed, 20 insertions, 8 deletions
diff --git a/test/test_vcl.py b/test/test_vcl.py
index 0ef4b5c079e..e49c9d800e0 100644
--- a/test/test_vcl.py
+++ b/test/test_vcl.py
@@ -259,10 +259,12 @@ class LDPCutThruTestCase(VCLTestCase):
self.server_port]
def tearDown(self):
- self.logger.debug(self.vapi.cli("show session verbose 2"))
self.cut_thru_tear_down()
super(LDPCutThruTestCase, self).tearDown()
+ def show_commands_at_teardown(self):
+ self.logger.debug(self.vapi.cli("show session verbose 2"))
+
@unittest.skipUnless(running_extended_tests, "part of extended tests")
def test_ldp_cut_thru_echo(self):
""" run LDP cut thru echo test """
@@ -396,11 +398,13 @@ class VCLThruHostStackEcho(VCLTestCase):
self.server_port]
def tearDown(self):
- self.logger.debug(self.vapi.cli("show app server"))
- self.logger.debug(self.vapi.cli("show session verbose"))
self.thru_host_stack_tear_down()
super(VCLThruHostStackEcho, self).tearDown()
+ def show_commands_at_teardown(self):
+ self.logger.debug(self.vapi.cli("show app server"))
+ self.logger.debug(self.vapi.cli("show session verbose"))
+
class VCLThruHostStackTLS(VCLTestCase):
""" VCL Thru Host Stack TLS """
@@ -432,11 +436,13 @@ class VCLThruHostStackTLS(VCLTestCase):
self.client_uni_dir_tls_test_args)
def tearDown(self):
- self.logger.debug(self.vapi.cli("show app server"))
- self.logger.debug(self.vapi.cli("show session verbose 2"))
self.thru_host_stack_tear_down()
super(VCLThruHostStackTLS, self).tearDown()
+ def show_commands_at_teardown(self):
+ self.logger.debug(self.vapi.cli("show app server"))
+ self.logger.debug(self.vapi.cli("show session verbose 2"))
+
class VCLThruHostStackBidirNsock(VCLTestCase):
""" VCL Thru Host Stack Bidir Nsock """
@@ -463,10 +469,12 @@ class VCLThruHostStackBidirNsock(VCLTestCase):
self.server_port]
def tearDown(self):
- self.logger.debug(self.vapi.cli("show session verbose 2"))
self.thru_host_stack_tear_down()
super(VCLThruHostStackBidirNsock, self).tearDown()
+ def show_commands_at_teardown(self):
+ self.logger.debug(self.vapi.cli("show session verbose 2"))
+
def test_vcl_thru_host_stack_bi_dir_nsock(self):
""" run VCL thru host stack bi-directional (multiple sockets) test """
@@ -507,10 +515,12 @@ class LDPThruHostStackBidirNsock(VCLTestCase):
self.server_port]
def tearDown(self):
- self.logger.debug(self.vapi.cli("show session verbose 2"))
self.thru_host_stack_tear_down()
super(LDPThruHostStackBidirNsock, self).tearDown()
+ def show_commands_at_teardown(self):
+ self.logger.debug(self.vapi.cli("show session verbose 2"))
+
def test_ldp_thru_host_stack_bi_dir_nsock(self):
""" run LDP thru host stack bi-directional (multiple sockets) test """
@@ -620,10 +630,12 @@ class LDPThruHostStackIperf(VCLTestCase):
self.server_iperf3_args = ["-V4d", "-s"]
def tearDown(self):
- self.logger.debug(self.vapi.cli("show session verbose 2"))
self.thru_host_stack_tear_down()
super(LDPThruHostStackIperf, self).tearDown()
+ def show_commands_at_teardown(self):
+ self.logger.debug(self.vapi.cli("show session verbose 2"))
+
def test_ldp_thru_host_stack_iperf3(self):
""" run LDP thru host stack iperf3 test """