ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: more options for decoding pcaps

Browse Source 
Introduce "none", "all" and "failed" options for --decode-pcaps
parameter. Keep "failed" as default to be consistent with current
behaviour. Add missing documentation to test/Makefile and passthrough to
Makefile.

Rationale: running tshark binary takes about 100-150ms and if there are
thousands of pcap files, it takes minutes to decode them. This might not
be desirable if rerunning the tests repeatedly during development.

Type: improvement
Change-Id: Ie033521d51d18b9d499b9bc40fe6eff21c94622d
Signed-off-by: Klement Sekera <klement.sekera@gmail.com>
This commit is contained in:
Klement Sekera 2024-05-23 11:19:51 +02:00 committed by Dave Wallace
parent 9bff049b84
commit ca2f2e1ec9
4 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -473,6 +473,7 @@ define test
VPP_BIN=$(BR)/install-$(1)-native/vpp/bin/vpp \
VPP_INSTALL_PATH=$(BR)/install-$(1)-native/ \
EXTENDED_TESTS=$(EXTENDED_TESTS) \
DECODE_PCAPS=$(DECODE_PCAPS) \
TEST_GCOV=$(TEST_GCOV) \
PYTHON=$(PYTHON) \
OS_ID=$(OS_ID) \

8
test/Makefile
View File

@ -255,8 +255,8 @@ ARG17=--extern-apidir=$(EXTERN_APIDIR)
endif
ARG18=
ifneq ($(findstring $(DECODE_PCAPS),1 y yes),)
ARG18=--decode-pcaps
ifneq ($(DECODE_PCAPS),)
ARG18=--decode-pcaps=$(DECODE_PCAPS)
endif
ifneq ($(findstring $(API_PRELOAD),1 y yes),)
@ -654,6 +654,10 @@ help:
@echo " random seed used by test framework"
@echo " (default: time.time())"
@echo ""
@echo " DECODE_PCAPS=[all|failed|none]"
@echo " decode pcap files using tshark - all, only failed or none"
@echo " (default: failed)"
@echo ""
@echo "Starting VPP in GDB for use with DEBUG=attach:"
@echo ""
@echo " test-start-vpp-in-gdb - start VPP in gdb (release)"

16
test/asf/asfframework.py
View File

@ -1161,16 +1161,13 @@ class VppTestResult(unittest.TestResult):
self.runner = runner
self.printed = []
def decodePcapFiles(self, test, when_configured=False):
if when_configured == False or config.decode_pcaps == True:
def decodePcapFiles(self, test):
if hasattr(test, "pg_interfaces") and len(test.pg_interfaces) > 0:
testcase_dir = os.path.dirname(test.pg_interfaces[0].out_path)
test.pg_interfaces[0].decode_pcap_files(
testcase_dir, f"suite{test.__class__.__name__}"
)
test.pg_interfaces[0].decode_pcap_files(
testcase_dir, test._testMethodName
)
test.pg_interfaces[0].decode_pcap_files(testcase_dir, test._testMethodName)
def addSuccess(self, test):
"""
@ -1180,7 +1177,8 @@ class VppTestResult(unittest.TestResult):
"""
self.log_result("addSuccess", test)
self.decodePcapFiles(test, when_configured=True)
if "all" == config.decode_pcaps:
self.decodePcapFiles(test)
unittest.TestResult.addSuccess(self, test)
self.result_string = colorize("OK", GREEN)
self.result_code = TestResultCode.PASS
@ -1188,6 +1186,7 @@ class VppTestResult(unittest.TestResult):
def addExpectedFailure(self, test, err):
self.log_result("addExpectedFailure", test, err)
if "none" != config.decode_pcaps:
self.decodePcapFiles(test)
super().addExpectedFailure(test, err)
self.result_string = colorize("FAIL", GREEN)
@ -1196,7 +1195,8 @@ class VppTestResult(unittest.TestResult):
def addUnexpectedSuccess(self, test):
self.log_result("addUnexpectedSuccess", test)
self.decodePcapFiles(test, when_configured=True)
if "none" != config.decode_pcaps:
self.decodePcapFiles(test)
super().addUnexpectedSuccess(test)
self.result_string = colorize("OK", RED)
self.result_code = TestResultCode.UNEXPECTED_PASS
@ -1282,6 +1282,8 @@ class VppTestResult(unittest.TestResult):
error_type_str = colorize("ERROR", RED)
else:
raise Exception(f"Unexpected result code {result_code}")
if "none" != config.decode_pcaps:
self.decodePcapFiles(test)
unittest_fn(self, test, err)

5
test/config.py
View File

@ -409,10 +409,11 @@ parser.add_argument(
"/var/run/user/${uid}/vpp.",
)
default_decode_pcaps = False
default_decode_pcaps = "failed"
parser.add_argument(
"--decode-pcaps",
action="store_true",
action="store",
choices=["none", "failed", "all"],
default=default_decode_pcaps,
help=f"if set, decode all pcap files from a test run (default: {default_decode_pcaps})",
)