[dts][PATCH V2 1/2] tests/dynamic_queue: modify script according to dpdk code change

[dts][PATCH V2 1/2] tests/dynamic_queue: modify script according to dpdk code change

[Lingli Chen]

According to dpdk commit 3c4426db54fc(app/testpmd: do not poll stopped queues)
modify dynamic_queue: Tx stopped queue not display

Signed-off-by: Lingli Chen <linglix.chen@intel.com>
---
 test_plans/dynamic_queue_test_plan.rst |  4 ++--
 tests/TestSuite_dynamic_queue.py       | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/test_plans/dynamic_queue_test_plan.rst b/test_plans/dynamic_queue_test_plan.rst
index 96cfcb8a..d22068a0 100644
--- a/test_plans/dynamic_queue_test_plan.rst
+++ b/test_plans/dynamic_queue_test_plan.rst
@@ -94,7 +94,7 @@ Stop one Tx queue on port 0::
 
 Set txonly forward, start testpmd
 
-Start testpmd, then stop, check this stopped queue only transmits 255 packets
+Start testpmd, then stop, check this stopped queue not display
   
 Setup this stopped queue on the port::
 
@@ -162,7 +162,7 @@ Stop one Tx queue on port 0::
 
 Set txonly forward, start testpmd
 
-Start testpmd, then stop, check this stopped queue only transmits 255 packets
+Start testpmd, then stop, check this stopped queue not display
 
 Reconfigure ring size as 512 for the stopped queues on port 0::
 
diff --git a/tests/TestSuite_dynamic_queue.py b/tests/TestSuite_dynamic_queue.py
index ebbe869c..5a826bd1 100644
--- a/tests/TestSuite_dynamic_queue.py
+++ b/tests/TestSuite_dynamic_queue.py
@@ -163,13 +163,14 @@ class TestDynamicQueue(TestCase):
             out = self.dut_testpmd.execute_cmd("stop")
             tx_num = qringsize - 1
 
-            if self.nic in ["cavium_a063", "cavium_a064"]:
-                self.verify("TX-packets: 0" in out, "Fail to stop txq at runtime")
-            else:
-                # Check Tx stopped queue only transmits qringsize-1 packets
-                self.verify(
-                    "TX-packets: %d" % tx_num in out, "Fail to stop txq at runtime"
-                )
+            # check rxq start successful
+            self.verify("TX-packets:" in out, "txq start failed")
+            # check Tx stopped queue not display
+            self.verify(
+                "TX Port= 0/Queue={:>2}".format(queue) not in out,
+                "Fail to stop txq at runtime",
+            )
+
             if chgflag == 1:
                 chg_qringsize = qringsize % 1024 + 256
                 if qringsize == 512:
-- 
2.17.1

[dts][PATCH V2 2/2] tests/queue_start_stop: modify script according to dpdk code change

[Lingli Chen]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 2333 bytes --]

According to dpdk commit 3c4426db54fc(app/testpmd: do not poll stopped queues)
modify queue_start_stop: after set “port 0 txq 0 stop”, no print in testpmd.

Signed-off-by: Lingli Chen <linglix.chen@intel.com>
---
 test_plans/queue_start_stop_test_plan.rst |  2 +-
 tests/TestSuite_queue_start_stop.py       | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/test_plans/queue_start_stop_test_plan.rst b/test_plans/queue_start_stop_test_plan.rst
index cf660710..e895076d 100644
--- a/test_plans/queue_start_stop_test_plan.rst
+++ b/test_plans/queue_start_stop_test_plan.rst
@@ -43,7 +43,7 @@ This case support PF (Intel® Ethernet 700 Series), VF (Intel® Ethernet 700 Ser
 #. Start packet generator to transmit and not receive packets
 #. Run "port 0 rxq 0 start" to start rxq 0 in port 0
 #. Run "port 1 txq 1 stop" to start txq 0 in port 1
-#. Start packet generator to transmit and not receive packets but in testpmd it is a "ports 0 queue 0 received 1 packages" print
+#. Start packet generator to transmit and not receive packets
 #. Run "port 1 txq 1 start" to start txq 0 in port 1
 #. Start packet generator to transmit and receive packets
 #. Test it again with VF
diff --git a/tests/TestSuite_queue_start_stop.py b/tests/TestSuite_queue_start_stop.py
index 1df59a1b..f5028e8b 100644
--- a/tests/TestSuite_queue_start_stop.py
+++ b/tests/TestSuite_queue_start_stop.py
@@ -134,21 +134,9 @@ class TestQueueStartStop(TestCase):
             self.dut.send_expect("port 0 txq 0 stop", "testpmd>")
             self.dut.send_expect("start", "testpmd>")
             self.check_forwarding([0, 0], self.nic, received=False)
-            out = self.dut.get_session_output()
         except Exception as e:
             raise IOError("queue start/stop forward failure: %s" % e)
 
-        if self.nic == "cavium_a063":
-            self.verify(
-                "ports 0 queue 0 receive 4 packages" in out,
-                "start queue revice package failed, out = %s" % out,
-            )
-        else:
-            self.verify(
-                "ports 0 queue 0 receive 1 packages\r\n" * 4 in out,
-                "start queue revice package failed, out = %s" % out,
-            )
-
         try:
             # start tx queue test
             print("test start rx and tx queue")
-- 
2.17.1