From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 2A2D0A48E for ; Mon, 21 May 2018 04:35:55 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2018 19:35:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,425,1520924400"; d="scan'208";a="56961889" Received: from unknown (HELO dpdk-fedora20.icx.intel.com) ([10.240.176.135]) by fmsmga001.fm.intel.com with ESMTP; 20 May 2018 19:35:54 -0700 From: "xu,gang" To: dts@dpdk.org Cc: "xu,gang" Date: Mon, 21 May 2018 10:37:10 +0800 Message-Id: <1526870230-22777-1-git-send-email-gangx.xu@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dts] [PATCH V1] modify unit_tests_dump keyword matching 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: , X-List-Received-Date: Mon, 21 May 2018 02:35:56 -0000 in dpdk-18.05-rc4, the dpdk prompt information change, the patch modify corresponding keywords Signed-off-by: xu,gang --- tests/TestSuite_unit_tests_dump.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/TestSuite_unit_tests_dump.py b/tests/TestSuite_unit_tests_dump.py index f7985f2..a22afe9 100644 --- a/tests/TestSuite_unit_tests_dump.py +++ b/tests/TestSuite_unit_tests_dump.py @@ -127,7 +127,7 @@ class TestUnitTestsDump(TestCase): out = self.dut.send_expect("dump_physmem", "RTE>>", self.run_cmd_time * 2) self.dut.send_expect("quit", "# ") elements = ['Segment', 'IOVA', 'len', 'virt', 'socket_id', 'hugepage_sz', 'nchannel', 'nrank'] - match_regex = "Segment (\d)+:" + match_regex = "Segment (.*?):" for element in elements[1:-1]: match_regex += " %s:(.*?)," % element match_regex += " %s:(.*?)" % elements[-1] @@ -152,14 +152,13 @@ class TestUnitTestsDump(TestCase): out = self.dut.send_expect("dump_memzone", "testpmd>", self.run_cmd_time * 2) self.dut.send_expect("quit", "# ") - elements = ['Zone', 'name', 'IO', 'len', 'virt', 'socket_id', 'flags'] + elements = ['Zone', 'name', 'len', 'virt', 'socket_id', 'flags'] match_regex = "Zone (\d):" for element in elements[1:-1]: match_regex += " %s:(.*?)," % element match_regex += " %s:(.*?)\n" % elements[-1] m = re.compile(r"%s" % match_regex, re.DOTALL) results = m.findall(out) - memzone_info = [] for result in results: memzone_info.append(dict(zip(elements, result))) @@ -180,6 +179,7 @@ class TestUnitTestsDump(TestCase): match_regex += "sizeof\(%s\) = (\d+)\r\n" % element match_regex += "sizeof\(%s\) = (\d+)" % elements[-1] m = re.compile(r"%s" % match_regex, re.S) + result = m.search(out) struct_info = dict(zip(elements, result.groups())) -- 1.9.3