From patchwork Mon Feb 22 11:08:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: skalal@marvell.com X-Patchwork-Id: 90355 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 820D1A0579; Thu, 1 Apr 2021 13:21:57 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 68EF4141078; Thu, 1 Apr 2021 13:21:57 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 3116A4003C for ; Mon, 22 Feb 2021 12:09:10 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 11MB5tBV005786 for ; Mon, 22 Feb 2021 03:09:09 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=pfpt0220; bh=XPKzF42r9ncVsGQ8Har6k7Jc9dy21eSVewR8gkKmUh4=; b=OrOWO43nlRE96W4IfLGIj5lT8ZkT1u7KE0nARV2djj46bEV+Mpgm3HDNZ8QnGECTq6jb L3eaGIrx/HCZO4KdYj1aRwUGNfoGv95+DE3IfIdtq36ayGM3G7cIMR3Ht/WOboTqJqyE +HyXlMnGlUCIOvDzRn6MaENRNDCErD3izB+N20vBrMWbK65mUfT9skkMTBTvRuLqd/++ 5dTiNMzgez9iC8XFVX+0Hp8rtJtGnEzWI2bXF2l7hZPekqArno+XKErX4haPm75be35+ nnjnNavIF+yeGd4e/mTETkzOt0603VXVxmGoTdTXITT6AukBRiFsHDJrOYOWWqBzueWv Kg== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com with ESMTP id 36u0nwbygw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Mon, 22 Feb 2021 03:09:09 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 22 Feb 2021 03:09:08 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 22 Feb 2021 03:09:07 -0800 Received: from localhost.marvell.com (unknown [10.28.8.29]) by maili.marvell.com (Postfix) with ESMTP id BDCB73F703F; Mon, 22 Feb 2021 03:09:06 -0800 (PST) From: To: CC: , , skalal Date: Mon, 22 Feb 2021 16:38:49 +0530 Message-ID: <20210222110849.20540-1-skalal@marvell.com> X-Mailer: git-send-email 2.9.5 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369, 18.0.761 definitions=2021-02-22_02:2021-02-18, 2021-02-22 signatures=0 X-Mailman-Approved-At: Thu, 01 Apr 2021 13:21:56 +0200 Subject: [dts] [PATCH] tests/TestSuite_short_live.py: Corrected the expected prompt of the "pkill" command ran to terminate the l2fwd and l3fwd application. X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 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: skalal Signed-off-by: skalal --- tests/TestSuite_short_live.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/TestSuite_short_live.py b/tests/TestSuite_short_live.py index 91deded..5ebf0b4 100644 --- a/tests/TestSuite_short_live.py +++ b/tests/TestSuite_short_live.py @@ -127,7 +127,7 @@ class TestShortLiveApp(TestCase): process_file = "/var/run/dpdk/rte/config" delay = 0 while delay < delay_max: - process = self.dut.send_expect("lsof %s | wc -l" % process_file, "#") + process = self.dut.send_expect("lsof %s | wc -l" % process_file, "# ") # as FUSE filesystem may not be accessible for root, so the output might include some warning info res = process.splitlines()[-1].strip() if res != '0': @@ -162,7 +162,7 @@ class TestShortLiveApp(TestCase): time = [] regex = re.compile(".* (\d+:\d{2}\.\d{2}).*") eal_para = self.dut.create_eal_parameters(no_pci=True) - out = self.dut.send_expect("echo quit | time ./%s %s -- -i" % (self.app_testpmd, eal_para), "#", 120) + out = self.dut.send_expect("echo quit | time ./%s %s -- -i" % (self.app_testpmd, eal_para), "# ", 120) time = regex.findall(out) if time != []: @@ -189,9 +189,9 @@ class TestShortLiveApp(TestCase): # kill with different Signal if i%2 == 0: - self.dut.send_expect("pkill -2 testpmd", "#", 60, True) + self.dut.send_expect("pkill -2 testpmd", "# ", 60, True) else: - self.dut.send_expect("pkill -15 testpmd", "#", 60, True) + self.dut.send_expect("pkill -15 testpmd", "# ", 60, True) self.check_process() def test_clean_up_with_signal_l2fwd(self): @@ -205,9 +205,9 @@ class TestShortLiveApp(TestCase): # kill with different Signal if i%2 == 0: - self.dut.send_expect("pkill -2 l2fwd", "#", 60, True) + self.dut.send_expect("pkill -2 l2fwd", "Bye...", 60) else: - self.dut.send_expect("pkill -15 l2fwd", "#", 60, True) + self.dut.send_expect("pkill -15 l2fwd", "Bye...", 60) self.check_process() def test_clean_up_with_signal_l3fwd(self): @@ -221,9 +221,9 @@ class TestShortLiveApp(TestCase): # kill with different Signal if i%2 == 0: - self.dut.send_expect("pkill -2 l3fwd", "#", 60, True) + self.dut.send_expect("pkill -2 l3fwd", "Bye...", 60) else: - self.dut.send_expect("pkill -15 l3fwd", "#", 60, True) + self.dut.send_expect("pkill -15 l3fwd", "Bye...", 60) self.check_process() def tear_down(self): @@ -238,6 +238,6 @@ class TestShortLiveApp(TestCase): Run after each test suite. """ self.dut.kill_all() - self.dut.send_expect("rm -rf ./app/test-pmd/testpmd", "#") - self.dut.send_expect("rm -rf ./app/test-pmd/*.o", "#") - self.dut.send_expect("rm -rf ./app/test-pmd/build", "#") + self.dut.send_expect("rm -rf ./app/test-pmd/testpmd", "# ") + self.dut.send_expect("rm -rf ./app/test-pmd/*.o", "# ") + self.dut.send_expect("rm -rf ./app/test-pmd/build", "# ")