From patchwork Mon Nov 2 08:22:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhou, JunX W" X-Patchwork-Id: 83362 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 00358A04E7; Mon, 2 Nov 2020 09:20:03 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E155C66DA; Mon, 2 Nov 2020 09:20:02 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 0DD535AB9 for ; Mon, 2 Nov 2020 09:19:59 +0100 (CET) IronPort-SDR: ubCWfGNRJTABPRqMVfi5pKLPjwD3OcdeMH0+w7Ai3SC04opM3hMVx3WbJSQNhisNstINn0k5Xp ciI5kn7pJK2Q== X-IronPort-AV: E=McAfee;i="6000,8403,9792"; a="230482760" X-IronPort-AV: E=Sophos;i="5.77,444,1596524400"; d="scan'208";a="230482760" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Nov 2020 00:19:57 -0800 IronPort-SDR: FY8CyGZLciC20XwQc9JTtu7KCTh+agpapFpOcouvvbnLJu/Lwo+CBdU1xbLSJt/Qf4rG/5WiKJ MWwhkavxPM4Q== X-IronPort-AV: E=Sophos;i="5.77,444,1596524400"; d="scan'208";a="537926588" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Nov 2020 00:19:55 -0800 From: "Zhou, Jun" To: dts@dpdk.org Cc: "Zhou, Jun" , Zhou@dpdk.org Date: Mon, 2 Nov 2020 16:22:11 +0800 Message-Id: <20201102082211.13792-1-junx.w.zhou@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dts] [PATCH V1] DTS modify verify value to adapt dpdk's echo changes 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" DTS modify verify value to adapt dpdk's echo changes Signed-off-by: Zhou, Jun Tested-by: Zhou, Jun --- tests/TestSuite_coremask.py | 4 ++-- tests/TestSuite_l3fwdacl.py | 6 +++--- tests/TestSuite_unit_tests_dump.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/TestSuite_coremask.py b/tests/TestSuite_coremask.py index 73341bdf..43c68e9d 100644 --- a/tests/TestSuite_coremask.py +++ b/tests/TestSuite_coremask.py @@ -107,7 +107,7 @@ class TestCoremask(TestCase): self.verify("EAL: Detected lcore %s as core" % core in out, "Core %s not detected" % core) - self.verify("EAL: Master lcore %s is ready" % core in out, + self.verify("EAL: Main lcore %s is ready" % core in out, "Core %s not ready" % core) self.dut.send_expect("quit", "# ", 10) @@ -126,7 +126,7 @@ class TestCoremask(TestCase): command = command_line % (self.app_test_path, core_mask, self.mem_channel) out = self.dut.send_expect(command, "RTE>>", 10) - self.verify("EAL: Master lcore %s is ready" % first_core in out, + self.verify("EAL: Main lcore %s is ready" % first_core in out, "Core %s not ready" % first_core ) self.verify("EAL: Detected lcore %s as core" % first_core in out, diff --git a/tests/TestSuite_l3fwdacl.py b/tests/TestSuite_l3fwdacl.py index 35b7c25b..cc87e172 100644 --- a/tests/TestSuite_l3fwdacl.py +++ b/tests/TestSuite_l3fwdacl.py @@ -170,7 +170,7 @@ class TestL3fwdacl(TestCase): extra_args = '' if scalar: - extra_args = '--scalar' + extra_args = '--alg="scalar"' cmdline = '%s -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" %s' % \ (self.app_l3fwd_acl_path, self.core_mask, self.dut.get_memory_channels(), @@ -840,7 +840,7 @@ class TestL3fwdacl(TestCase): rule_list_ipv4.append(TestL3fwdacl.invalid_port_rule_ipv4) self.create_acl_ipv4_db(rule_list_ipv4) - cmdline = '%s -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --scalar' % \ + cmdline = '%s -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --alg="scalar"' % \ (self.app_l3fwd_acl_path, self.core_mask, self.dut.get_memory_channels(), self.port_mask, self.dut_ports[0], self.dut_ports[1], TestL3fwdacl.acl_ipv4_db, TestL3fwdacl.acl_ipv6_db) @@ -852,7 +852,7 @@ class TestL3fwdacl(TestCase): rule_list_ipv6.append(TestL3fwdacl.invalid_port_rule_ipv6) self.create_acl_ipv6_db(rule_list_ipv6) - cmdline = '%s -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --scalar' % \ + cmdline = '%s -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --alg="scalar"' % \ (self.app_l3fwd_acl_path, self.core_mask, self.dut.get_memory_channels(), self.port_mask, self.dut_ports[0], self.dut_ports[1], TestL3fwdacl.acl_ipv4_db, TestL3fwdacl.acl_ipv6_db) diff --git a/tests/TestSuite_unit_tests_dump.py b/tests/TestSuite_unit_tests_dump.py index 603cc1a3..336cce21 100644 --- a/tests/TestSuite_unit_tests_dump.py +++ b/tests/TestSuite_unit_tests_dump.py @@ -102,7 +102,7 @@ class TestUnitTestsDump(TestCase): # Nic driver will create multiple rings. # Only check the last one to make sure ring_dump function work. - self.verify( 'MP_mbuf_pool_socket_0' in results, "dump ring name failed") + self.verify( 'MP_mb_pool_0' in results, "dump ring name failed") for result in results: self.dut.send_expect("%s" % cmd, "testpmd>", self.start_test_time) out = self.dut.send_expect("dump_ring %s" % result, "testpmd>", self.run_cmd_time) @@ -123,7 +123,7 @@ class TestUnitTestsDump(TestCase): m = re.compile(r"%s" % match_regex, re.S) results = m.findall(out) - self.verify(results[0][0] == 'mbuf_pool_socket_0', "dump mempool name failed") + self.verify(results[0][0] == 'mb_pool_0', "dump mempool name failed") for result in results: self.dut.send_expect("%s" % cmd, "testpmd>", self.start_test_time) out = self.dut.send_expect("dump_mempool %s" % result[0], "testpmd>", self.run_cmd_time * 2)