[dts] [PATCH V2 1/2] tests/ice_dcf_switch_filter_gtpu: optimization scrip

[dts] [PATCH V2 1/2] tests/ice_dcf_switch_filter_gtpu: optimization scrip

[Song Jiale]

1.add timeout
2.the "testpmd_status" is the wrong status when launch app timeout,
it will affect other cases test.therefore, add "kill_all" to ensure 
that all dpdk processes are closed.

Signed-off-by: Song Jiale <songx.jiale@intel.com>
---
 tests/TestSuite_ice_dcf_switch_filter_gtpu.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tests/TestSuite_ice_dcf_switch_filter_gtpu.py b/tests/TestSuite_ice_dcf_switch_filter_gtpu.py
index 0f48d78d..8c63a976 100644
--- a/tests/TestSuite_ice_dcf_switch_filter_gtpu.py
+++ b/tests/TestSuite_ice_dcf_switch_filter_gtpu.py
@@ -3592,8 +3592,7 @@ class ICEDCFSwitchFilterGTPUTest(TestCase):
         """
         dcf switch need reload driver to ensure create rule sucessful
         """
-        self.dut.send_expect("rmmod ice", "# ", 15)
-        self.dut.send_expect("modprobe ice", "# ", 15)
+        self.dut.send_expect("rmmod ice && modprobe ice", "# ", 60)
 
     def create_testpmd_command(self):
         """
@@ -3617,7 +3616,7 @@ class ICEDCFSwitchFilterGTPUTest(TestCase):
         launch testpmd with the command
         """
         command = self.create_testpmd_command()
-        self.dut.send_expect(command, "testpmd> ", 15)
+        self.dut.send_expect(command, "testpmd> ", 30)
         self.testpmd_status = "running"
         self.dut.send_expect("set portlist 1", "testpmd> ", 15)
         self.dut.send_expect("set fwd rxonly", "testpmd> ", 15)
@@ -3822,12 +3821,10 @@ class ICEDCFSwitchFilterGTPUTest(TestCase):
             self.dut.send_expect("flow flush 0", "testpmd> ", 15)
             self.dut.send_expect("clear port stats all", "testpmd> ", 15)
             self.dut.send_expect("quit", "#", 15)
-            # kill all DPDK application
-            self.dut.kill_all()
             # destroy vfs
             for port_id in self.dut_ports:
                 self.dut.destroy_sriov_vfs_by_port(port_id)
-        self.testpmd_status = "close"
+            self.testpmd_status = "close"
         if getattr(self, "session_secondary", None):
             self.dut.close_session(self.session_secondary)
 
@@ -3971,6 +3968,8 @@ class ICEDCFSwitchFilterGTPUTest(TestCase):
         Run after each test case.
         """
         self.destroy_testpmd_and_vf()
+        # kill all DPDK application
+        self.dut.kill_all()
 
     def tear_down_all(self):
         """
-- 
2.17.1

[dts] [PATCH V2 2/2] tests/ice_dcf_switch_filter_pppoe: optimization scrip

[Song Jiale]

1.add timeout
2.the "testpmd_status" is the wrong status when launch app timeout,
it will affect other cases test.therefore, add "kill_all" to ensure
that all dpdk processes are closed.

Signed-off-by: Song Jiale <songx.jiale@intel.com>
---
 tests/TestSuite_ice_dcf_switch_filter_pppoe.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tests/TestSuite_ice_dcf_switch_filter_pppoe.py b/tests/TestSuite_ice_dcf_switch_filter_pppoe.py
index 7b974e01..9cd6cf9b 100644
--- a/tests/TestSuite_ice_dcf_switch_filter_pppoe.py
+++ b/tests/TestSuite_ice_dcf_switch_filter_pppoe.py
@@ -867,8 +867,7 @@ class ICEDCFSwitchFilterPPPOETest(TestCase):
         time.sleep(5)
 
     def reload_ice(self):
-        self.dut.send_expect("rmmod ice", "# ", 15)
-        self.dut.send_expect("modprobe ice", "# ", 15)
+        self.dut.send_expect("rmmod ice && modprobe ice", "# ", 60)
 
     def set_up(self):
         """
@@ -896,7 +895,7 @@ class ICEDCFSwitchFilterPPPOETest(TestCase):
         launch testpmd with the command
         """
         command = self.create_testpmd_command()
-        out = self.dut.send_expect(command, "testpmd> ", 15)
+        out = self.dut.send_expect(command, "testpmd> ", 30)
         self.testpmd_status = "running"
         self.dut.send_expect("set portlist 1", "testpmd> ", 15)
         self.dut.send_expect("set fwd rxonly", "testpmd> ", 15)
@@ -1266,14 +1265,14 @@ class ICEDCFSwitchFilterPPPOETest(TestCase):
             self.dut.send_expect("flow flush 0", "testpmd> ", 15)
             self.dut.send_expect("clear port stats all", "testpmd> ", 15)
             self.dut.send_expect("quit", "#", 15)
-            # kill all DPDK application
-            self.dut.kill_all()
             # destroy vfs
             for port_id in self.dut_ports:
                 self.dut.destroy_sriov_vfs_by_port(port_id)
-        self.testpmd_status = "close"
+            self.testpmd_status = "close"
         if getattr(self, "session_secondary", None):
             self.dut.close_session(self.session_secondary)
+        # kill all DPDK application
+        self.dut.kill_all()
 
     def tear_down_all(self):
         """
-- 
2.17.1