[V1,1/2] tests/cbdma: modify testsuite sync with dpdk change
Commit Message
1.According to the dpdk-21.11-rc1 'd047310407a3511b1e2910c7ddf59d5049b202f6'
change from example/ioat to /example/dma, dts need to change sync with
dpdk.
2.The print info format have been changed, so need to modify check
point.
3.Improve checkpoints according to test plan.
Signed-off-by: Wei Ling <weix.ling@intel.com>
---
tests/TestSuite_cbdma.py | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
@@ -60,8 +60,8 @@ class TestCBDMA(TestCase):
self.cbdma_proc = '--proc-type=primary'
# default v_dev is None, case 1-6 use default None values, case7 use --vdev net_null_0
self.v_dev = ''
- out = self.dut.build_dpdk_apps('./examples/ioat')
- self.ioat_path = self.dut.apps_name['ioat']
+ out = self.dut.build_dpdk_apps('./examples/dma')
+ self.ioat_path = self.dut.apps_name['dma']
self.verify('Error' not in out, 'compilation ioat error')
def set_up(self):
@@ -92,10 +92,8 @@ class TestCBDMA(TestCase):
get all cbdma ports
"""
# check driver name in execution.cfg
- self.verify(self.drivername == 'igb_uio',
- "CBDMA test case only use igb_uio driver, need config drivername=igb_uio in execution.cfg")
str_info = 'Misc (rawdev) devices using kernel driver'
- out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
+ out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev dma', '# ', 30)
device_info = out.split('\n')
for device in device_info:
pci_info = re.search('\s*(0000:\d*:\d*.\d*)', device)
@@ -220,9 +218,9 @@ class TestCBDMA(TestCase):
out = self.send_session.get_session_before(timeout=2)
index = out.rfind('Statistics for port 0')
out = out[index:]
- data_info = re.findall('successful_enqueues:\s*(\d*)', out)
- self.verify(len(data_info) == self.cbdma_ioat_dev_num, 'There miss some queue, the run queue is '
- '%d, and expect queue num is %d' % (len(data_info), self.cbdma_ioat_dev_num))
+ data_info = re.findall('Total completed ops:\s*(\d*)', out)
+ self.verify((len(data_info) - 1) == self.cbdma_ioat_dev_num, 'There miss some queue, the run queue is '
+ '%d, and expect queue num is %d' % ((len(data_info) - 1), self.cbdma_ioat_dev_num))
for index in range(self.cbdma_ioat_dev_num):
self.verify(data_info[index] != 0, 'the queue %d can not enqueues data' % index)
@@ -254,7 +252,7 @@ class TestCBDMA(TestCase):
dev_info = self.get_ports_info()
eal_params = self.dut.create_eal_parameters(cores=self.core_list, ports=dev_info, prefix='cbdma')
self.launch_ioatfwd_app(eal_params)
- self.send_and_verify_throughput(check_channel=False)
+ self.send_and_verify_throughput(check_channel=True)
self.result_table_print()
def test_perf_cbdma_with_multi_thread(self):
@@ -271,7 +269,7 @@ class TestCBDMA(TestCase):
dev_info = self.get_ports_info()
eal_params = self.dut.create_eal_parameters(cores=self.core_list, ports=dev_info, prefix='cbdma')
self.launch_ioatfwd_app(eal_params)
- self.send_and_verify_throughput(check_channel=False)
+ self.send_and_verify_throughput(check_channel=True)
self.result_table_print()
def test_perf_cbdma_with_multi_nic_ports(self):
@@ -325,11 +323,11 @@ class TestCBDMA(TestCase):
dev_info = self.get_ports_info()
eal_params = self.dut.create_eal_parameters(cores=self.core_list, ports=dev_info, prefix='cbdma')
self.launch_ioatfwd_app(eal_params)
- self.send_and_verify_throughput(check_channel=False)
+ self.send_and_verify_throughput(check_channel=True)
self.send_session.send_expect('^c', '# ')
self.cbdma_updating_mac = 'disable'
self.launch_ioatfwd_app(eal_params)
- self.send_and_verify_throughput(check_channel=False)
+ self.send_and_verify_throughput(check_channel=True)
self.result_table_print()
def test_perf_cbdma_with_diff_copy_mode(self):