From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D87A4A04E1; Tue, 22 Sep 2020 10:22:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D02041D5D7; Tue, 22 Sep 2020 10:22:21 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id A8C871D580 for ; Tue, 22 Sep 2020 10:22:20 +0200 (CEST) IronPort-SDR: kSDbfKWkvgZvjQ+N/iuxG4leDsCeNpTu5kXkvjYnZZuK1iOaw9KKC0zzNqWjxStXCne/PC0Hls of2//wZKGcyA== X-IronPort-AV: E=McAfee;i="6000,8403,9751"; a="159844163" X-IronPort-AV: E=Sophos;i="5.77,290,1596524400"; d="scan'208";a="159844163" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2020 01:22:19 -0700 IronPort-SDR: v9tpBq2JWY17wMXaA1I4CUFUl58r7wyjp1cZNOjVe88VWtvNDMpZbbvYpqnCHC4c1njIHHtCdC N4Cna+n9LFtA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,290,1596524400"; d="scan'208";a="322140532" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by orsmga002.jf.intel.com with ESMTP; 22 Sep 2020 01:22:18 -0700 From: JiangYuX To: dts@dpdk.org Cc: JiangYu Date: Tue, 22 Sep 2020 16:21:39 +0800 Message-Id: <20200922082139.16312-1-yux.jiang@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dts] [PATCH V1] tests/TestSuite_virtio_perf_suites: get the app name from conf file to kill X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" From: JiangYu Get app name to kill or call from conf/app_name.cfg file Signed-off-by: JiangYu --- 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(-) 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): -- 2.7.4