[V1] tests:fix some suites impacted by Strip prompt in send_expect
Commit Message
fixs following suite impacted by commit f498f5:
* flow_classify_softnic
* test_ipv4_acl_jump
* test_ipv4_acl_table
* test_ipv6_hash_jump
* unit_tests_loopback
* test_link_mode
* test_loopback_mode
* distributor
* maximum_workers
Signed-off-by: Yang Leweix <leweix.yang@intel.com>
---
tests/TestSuite_distributor.py | 2 +-
tests/TestSuite_flow_classify_softnic.py | 2 +-
tests/TestSuite_unit_tests_loopback.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Comments
> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Yang Leweix
> Sent: 2021年6月3日 17:22
> To: dts@dpdk.org
> Cc: Yang, LeweiX <leweix.yang@intel.com>
> Subject: [dts] [PATCH V1] tests:fix some suites impacted by Strip prompt in
> send_expect
>
> fixs following suite impacted by commit f498f5:
> * flow_classify_softnic
> * test_ipv4_acl_jump
> * test_ipv4_acl_table
> * test_ipv6_hash_jump
> * unit_tests_loopback
> * test_link_mode
> * test_loopback_mode
> * distributor
> * maximum_workers
>
> Signed-off-by: Yang Leweix <leweix.yang@intel.com>
Applied, thanks
@@ -165,7 +165,7 @@ class TestDistributor(TestCase):
self.verify(len(self.dut_ports) >= 1, "Not enough ports")
cmd_fmt = "%s %s -- -p 0x1"
- out = self.dut.send_expect("sed -n '/#define RTE_DISTRIB_MAX_WORKERS/p' lib/distributor/distributor_private.h", "# ")
+ out = self.dut.send_expect("sed -n '/#define RTE_DISTRIB_MAX_WORKERS/p' lib/distributor/distributor_private.h", "# ", trim_whitespace=False)
reg_match = r"#define RTE_DISTRIB_MAX_WORKERS (.*)"
m = re.match(reg_match, out)
self.verify(m, "Can't find maximum worker number")
@@ -129,7 +129,7 @@ class TestFlowClassifySoftnic(TestCase):
"""
param = ""
direct_param = r"(\s+)\[ (\S+) in\|out\|inout \]"
- out = self.tester.send_expect('tcpdump -h', '# ')
+ out = self.tester.send_expect('tcpdump -h', '# ', trim_whitespace=False)
for line in out.split('\n'):
m = re.match(direct_param, line)
if m:
@@ -81,7 +81,7 @@ class TestUnitTestsLoopback(TestCase):
pass
def get_max_traffic_burst(self):
- pmd_file = self.dut.send_expect("cat app/test/test_pmd_perf.c", "# ", 30)
+ pmd_file = self.dut.send_expect("cat app/test/test_pmd_perf.c", "# ", 30, trim_whitespace=False)
result_scanner = r"#define MAX_TRAFFIC_BURST\s+([0-9]+)"
scanner = re.compile(result_scanner, re.DOTALL)
m = scanner.search(pmd_file)