diff mbox series

[V1] tests/TestSuite_virtio_perf_suites: get the app name from conf file to kill

Message ID 20200922082139.16312-1-yux.jiang@intel.com (mailing list archive)
State Accepted
Headers
Series [V1] tests/TestSuite_virtio_perf_suites: get the app name from conf file to kill |

Commit Message

Yu Jiang Sept. 22, 2020, 8:21 a.m. UTC 
  From: JiangYu <yux.jiang@intel.com>

Get app name to kill or call from conf/app_name.cfg file

Signed-off-by: JiangYu <yux.jiang@intel.com>
---
 tests/TestSuite_pvp_diff_qemu_version.py                     | 2 +-
 tests/TestSuite_pvp_vhost_user_reconnect.py                  | 4 ++--
 tests/TestSuite_pvp_virtio_bonding.py                        | 6 ++++--
 tests/TestSuite_pvp_virtio_user_4k_pages.py                  | 5 +++--
 tests/TestSuite_pvp_virtio_user_multi_queues_port_restart.py | 3 ++-
 tests/TestSuite_virtio_pvp_regression.py                     | 7 ++++---
 6 files changed, 16 insertions(+), 11 deletions(-)

Comments

Yu Jiang Sept. 22, 2020, 8:30 a.m. UTC | #1 
Tested-by: Jiang, YuX <yux.jiang@intel.com>

    Best Regards
    Jiang yu


> -----Original Message-----
> From: Jiang, YuX
> Sent: Tuesday, September 22, 2020 4:22 PM
> To: dts@dpdk.org
> Cc: Jiang, YuX <yux.jiang@intel.com>
> Subject: [dts] [PATCH V1] tests/TestSuite_virtio_perf_suites: get the app
> name from conf file to kill
Tu, Lijuan Sept. 28, 2020, 8:55 a.m. UTC | #2 
> Get app name to kill or call from conf/app_name.cfg file
> 
> Signed-off-by: JiangYu <yux.jiang@intel.com>

Applied
diff mbox series

Patch

diff --git a/tests/TestSuite_pvp_diff_qemu_version.py b/tests/TestSuite_pvp_diff_qemu_version.py
index 54f148f..49fa1e1 100644
--- a/tests/TestSuite_pvp_diff_qemu_version.py
+++ b/tests/TestSuite_pvp_diff_qemu_version.py
@@ -271,7 +271,7 @@  class TestVhostPVPDiffQemuVersion(TestCase):
         self.vm_dut.send_expect("quit", "#", 20)
         self.vhost.send_expect("quit", "#", 20)
         self.vm.stop()
-        self.dut.send_expect("killall -I testpmd", '#', 20)
+        self.dut.send_expect("killall -I %s" % self.testpmd_name, '#', 20)
         self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#")
 
     def test_perf_vhost_pvp_diffrent_qemu_version_mergeable_mac(self):
diff --git a/tests/TestSuite_pvp_vhost_user_reconnect.py b/tests/TestSuite_pvp_vhost_user_reconnect.py
index 026e03d..fcf8cae 100644
--- a/tests/TestSuite_pvp_vhost_user_reconnect.py
+++ b/tests/TestSuite_pvp_vhost_user_reconnect.py
@@ -102,7 +102,7 @@  class TestPVPVhostUserReconnect(TestCase):
         vdev_info = ""
         for i in range(self.vm_num):
             vdev_info += "--vdev 'net_vhost%d,iface=vhost-net%d,client=1,queues=1' " % (i, i)
-        testcmd = self.dut.base_dir + self.path
+        testcmd = self.dut.base_dir + "/%s" % self.path
         eal_params = self.dut.create_eal_parameters(cores=self.cores, prefix='vhost', ports=[self.pci_info])
         para = " -- -i --port-topology=chained --nb-cores=1 --txd=1024 --rxd=1024"
         self.vhostapp_testcmd = testcmd + eal_params + vdev_info + para
@@ -117,7 +117,7 @@  class TestPVPVhostUserReconnect(TestCase):
         vdev_info = ""
         for i in range(self.vm_num):
             vdev_info += "--vdev 'net_vhost%d,iface=vhost-net%d,client=1,queues=1' " % (i, i)
-        testcmd = self.dut.base_dir + self.path
+        testcmd = self.dut.base_dir + "/%s" % self.path
         eal_params = self.dut.create_eal_parameters(cores=self.cores, no_pci=True, prefix='vhost',
                                                     ports=[self.pci_info])
         para = " -- -i --nb-cores=1 --txd=1024 --rxd=1024"
diff --git a/tests/TestSuite_pvp_virtio_bonding.py b/tests/TestSuite_pvp_virtio_bonding.py
index fcde9ee..e6d0e61 100644
--- a/tests/TestSuite_pvp_virtio_bonding.py
+++ b/tests/TestSuite_pvp_virtio_bonding.py
@@ -69,13 +69,15 @@  class TestPVPVirtIOBonding(TestCase):
             self.tester.send_expect('mkdir -p %s' % self.out_path, '# ')
         # create an instance to set stream field setting
         self.pktgen_helper = PacketGeneratorHelper()
+        self.app_testpmd_path = self.dut.apps_name['test-pmd']
+        self.testpmd_name = self.app_testpmd_path.split("/")[-1]
 
     def set_up(self):
         """
         run before each test case.
         """
         self.dut.send_expect("rm -rf ./vhost.out", "#")
-        self.dut.send_expect("killall -s INT testpmd", "#")
+        self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#")
         self.dut.send_expect("killall -s INT qemu-system-x86_64", "#")
         self.start_testpmd_on_vhost()
         self.start_one_vm()
@@ -239,7 +241,7 @@  class TestPVPVirtIOBonding(TestCase):
         Run after each test case.
         """
         self.stop_testpmd_and_vm()
-        self.dut.send_expect("killall -s INT testpmd", "#")
+        self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#")
         self.dut.send_expect("killall -s INT qemu-system-x86_64", "#")
         time.sleep(2)
 
diff --git a/tests/TestSuite_pvp_virtio_user_4k_pages.py b/tests/TestSuite_pvp_virtio_user_4k_pages.py
index 4650499..98cfdce 100644
--- a/tests/TestSuite_pvp_virtio_user_4k_pages.py
+++ b/tests/TestSuite_pvp_virtio_user_4k_pages.py
@@ -81,13 +81,14 @@  class TestPvpVirtioUser4kPages(TestCase):
         self.pktgen_helper = PacketGeneratorHelper()
         self.number_of_ports = 1
         self.app_testpmd_path = self.dut.apps_name['test-pmd']
+        self.testpmd_name = self.app_testpmd_path.split("/")[-1]
 
     def set_up(self):
         """
         Run before each test case.
         """
         self.dut.send_expect("rm -rf ./vhost-net*", "# ")
-        self.dut.send_expect("killall -s INT testpmd", "# ")
+        self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "# ")
         self.vhost_user = self.dut.new_session(suite="vhost-user")
         self.virtio_user = self.dut.new_session(suite="virtio-user")
         # Prepare the result table
@@ -208,7 +209,7 @@  class TestPvpVirtioUser4kPages(TestCase):
         """
         Run after each test case.
         """
-        self.dut.send_expect("killall -s INT testpmd", "# ")
+        self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "# ")
         self.restore_env_of_tmpfs_for_4k()
 
     def tear_down_all(self):
diff --git a/tests/TestSuite_pvp_virtio_user_multi_queues_port_restart.py b/tests/TestSuite_pvp_virtio_user_multi_queues_port_restart.py
index d916d17..4710222 100644
--- a/tests/TestSuite_pvp_virtio_user_multi_queues_port_restart.py
+++ b/tests/TestSuite_pvp_virtio_user_multi_queues_port_restart.py
@@ -72,6 +72,7 @@  class TestPVPVirtioUserMultiQueuesPortRestart(TestCase):
         self.dut.kill_all()
         self.number_of_ports = 1
         self.app_testpmd_path = self.dut.apps_name['test-pmd']
+        self.testpmd_name = self.app_testpmd_path.split("/")[-1]
 
     def set_up(self):
         """
@@ -88,7 +89,7 @@  class TestPVPVirtioUserMultiQueuesPortRestart(TestCase):
         """
         start testpmd on vhost
         """
-        self.dut.send_expect("killall -s INT testpmd", "#")
+        self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#")
         self.dut.send_expect("rm -rf ./vhost-net*", "#")
         testcmd = self.app_testpmd_path + " "
         vdev = 'net_vhost0,iface=vhost-net,queues=2,client=0'
diff --git a/tests/TestSuite_virtio_pvp_regression.py b/tests/TestSuite_virtio_pvp_regression.py
index 80b4752..8e04ba5 100644
--- a/tests/TestSuite_virtio_pvp_regression.py
+++ b/tests/TestSuite_virtio_pvp_regression.py
@@ -93,6 +93,7 @@  class TestVirtioPVPRegression(TestCase):
         self.pktgen_helper = PacketGeneratorHelper()
         self.base_dir = self.dut.base_dir.replace('~', '/root')
         self.app_testpmd_path = self.dut.apps_name['test-pmd']
+        self.testpmd_name = self.app_testpmd_path.split("/")[-1]
 
     def set_up(self):
         """
@@ -362,7 +363,7 @@  class TestVirtioPVPRegression(TestCase):
         self.vm_dut.send_expect("quit", "#", 20)
         self.vhost.send_expect("quit", "#", 20)
         self.vm.stop()
-        self.dut.send_expect("killall -I testpmd", '#', 20)
+        self.dut.send_expect("killall -I %s" % self.testpmd_name, '#', 20)
         self.dut.send_expect('killall -s INT qemu-system-x86_64', '# ')
         self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#")
 
@@ -390,7 +391,7 @@  class TestVirtioPVPRegression(TestCase):
             self.send_verify(case_info, version, "before reconnect")
 
             self.logger.info('now reconnect from vhost')
-            self.dut.send_expect("killall -s INT testpmd", "# ")
+            self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "# ")
             self.start_testpmd_as_vhost()
             self.send_verify(case_info, version, "reconnect from vhost")
 
@@ -490,7 +491,7 @@  class TestVirtioPVPRegression(TestCase):
         """
         self.dut.close_session(self.vhost)
         self.dut.send_expect("killall -s INT qemu-system-x86_64", "#")
-        self.dut.send_expect("killall -s INT testpmd", "#")
+        self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#")
         time.sleep(2)
 
     def tear_down_all(self):