From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id AF4DC137D for ; Tue, 9 Aug 2016 07:47:59 +0200 (CEST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP; 08 Aug 2016 22:47:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,493,1464678000"; d="scan'208";a="746142289" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by FMSMGA003.fm.intel.com with ESMTP; 08 Aug 2016 22:47:58 -0700 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 8 Aug 2016 22:47:58 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 8 Aug 2016 22:47:57 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.8]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.116]) with mapi id 14.03.0248.002; Tue, 9 Aug 2016 13:47:56 +0800 From: "Xu, HuilongX" To: "Liu, Yong" , "dts@dpdk.org" Thread-Topic: [dts] [PATCH V1] update dump test suite Thread-Index: AQHR8U0em2QSWn+d5EqTTFGokJAbO6BAE10QgAAK6CA= Date: Tue, 9 Aug 2016 05:47:55 +0000 Message-ID: References: <1470643881-3347-1-git-send-email-huilongx.xu@intel.com> <86228AFD5BCD8E4EBFD2B90117B5E81E2226B626@SHSMSX103.ccr.corp.intel.com> In-Reply-To: <86228AFD5BCD8E4EBFD2B90117B5E81E2226B626@SHSMSX103.ccr.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dts] [PATCH V1] update dump test suite 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: Tue, 09 Aug 2016 05:48:00 -0000 Hi yong, Two comments. > -----Original Message----- > From: Liu, Yong > Sent: Tuesday, August 09, 2016 1:14 PM > To: Xu, HuilongX; dts@dpdk.org > Cc: Xu, HuilongX > Subject: RE: [dts] [PATCH V1] update dump test suite >=20 > Huilong, two comments below. >=20 > > -----Original Message----- > > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of xu,huilong > > Sent: Monday, August 08, 2016 4:11 PM > > To: dts@dpdk.org > > Cc: Xu, HuilongX > > Subject: [dts] [PATCH V1] update dump test suite > > > > update list: > > 1. discard test_log_dump, because this function remove in dpdk.org > > 2. update ring_dump/mempool_dump case, ignore get ring/mempool struct > info. > > because ring struct is a internal struct, only get ring/mempool > name. > > and check. > > 3. update dump_devargs case. update get pci address from portsInfo > > > > Signed-off-by: xu,huilong > > --- > > tests/TestSuite_unit_tests_dump.py | 38 ++++++++++++++++------------- > ---- > > ----- > > 1 file changed, 16 insertions(+), 22 deletions(-) > > > > diff --git a/tests/TestSuite_unit_tests_dump.py > > b/tests/TestSuite_unit_tests_dump.py > > index afdc256..26299f0 100644 > > --- a/tests/TestSuite_unit_tests_dump.py > > +++ b/tests/TestSuite_unit_tests_dump.py > > @@ -72,7 +72,7 @@ class TestUnitTestsDump(TestCase): > > """ > > pass > > > > - def test_log_dump(self): > > + def discard_test_log_dump(self): > > """ > > Run history log dump test case. > > """ > > @@ -86,40 +86,31 @@ class TestUnitTestsDump(TestCase): > > Run history log dump test case. > > """ > > self.dut.send_expect("./%s/app/test -n 1 -c ffff" % > (self.target), > > "R.*T.*E.*>.*>", self.start_test_time) > > + self.dut.send_expect("mempool_autotest", "RTE>>", > > self.run_cmd_time * 2) > > out =3D self.dut.send_expect("dump_ring", "RTE>>", > > self.run_cmd_time) > > self.dut.send_expect("quit", "# ") > > - elements =3D ['ring', 'address', 'flags', 'size', 'ct', 'ch', > 'pt', > > 'ph', 'used', 'avail', 'watermark'] > > + elements =3D ['ring', 'flags', 'size', 'ct', 'ch', 'pt', 'ph', > > 'used', 'avail', 'watermark'] > > match_regex =3D "ring <(.*?)>@0x(.*)\r\n" > > - for element in elements[2:]: > > - match_regex +=3D " %s=3D(\d*)\r\n" % element > > m =3D re.compile(r"%s" % match_regex, re.S) > > result =3D m.search(out) > > - ring_info =3D dict(zip(elements, result.groups())) > > + ring_info =3D result.groups() > > > > - self.verify(ring_info['ring'] =3D=3D 'MP_log_history', "Test > failed") > > + self.verify(len(ring_info) =3D=3D 2, "dump ring name failed") > > > Only check ring number is not enough, we'd better also check expected > ring name. The ring name only a string. The string content set by who will used it.=20 So I think we don't need check the string content. We only should check dum= p can work, and get ring struct info. And the struct content by dpdk decision. >=20 > > def test_mempool_dump(self): > > """ > > Run mempool dump test case. > > """ > > self.dut.send_expect("./%s/app/test -n 1 -c ffff" % > (self.target), > > "R.*T.*E.*>.*>", self.start_test_time) > > + self.dut.send_expect("mempool_autotest", "RTE>>", > > self.run_cmd_time * 2) > > out =3D self.dut.send_expect("dump_mempool", "RTE>>", > > self.run_cmd_time * 2) > > self.dut.send_expect("quit", "# ") > > - elements =3D ['mempool', 'flags', 'ring', 'phys_addr', > > 'nb_mem_chunks', 'size', 'populated_size', 'header_size', 'elt_size', > > - 'trailer_size', 'total_obj_size', > 'private_data_size', > > 'avg bytes/object', 'cache infos','cache_size', 'common_pool_count'] > > match_regex =3D "mempool <(.*?)>@0x(.*?)\r\n" > > - for element in elements[1:]: > > - if element =3D=3D 'cache_size': > > - match_regex +=3D " %s=3D(.*?)\r\n" % element > > - elif element =3D=3D 'cache infos': > > - match_regex +=3D " %s:\r\n" % element > > - else: > > - match_regex +=3D " %s=3D(.*?)\r\n" % element > > m =3D re.compile(r"%s" % match_regex, re.S) > > result =3D m.search(out) > > - mempool_info =3D dict(zip(elements, result.groups())) > > + mempool_info =3D result.groups() > > > > - self.verify(mempool_info['mempool'] =3D=3D 'log_history', "Tes= t > > failed") > > + self.verify(len(mempool_info) =3D=3D 2, "dump mempool name > failed") > > > > def test_physmem_dump(self): > > """ > > @@ -185,19 +176,22 @@ class TestUnitTestsDump(TestCase): > > Run devargs dump test case. > > """ > > test_port =3D self.dut_ports[0] > > - self.dut.send_expect("./%s/app/test -n 1 -c ffff -b %s" > > - % (self.target, > > self.dut.ports_info[test_port]['pci']), "R.*T.*E.*>.*>", > > self.start_test_time) > > + pci_address =3D self.dut.ports_info[test_port]['pci']; > > + if not pci_address.startswith('0000:'): > > + pci_address =3D '0000:' + pci_address > > + self.dut.send_expect("./%s/app/test -n 1 -c ffff -b %s" > > + % (self.target, pci_address), >=20 > pci_address should be correct, framework has been added domain id into > pci address. OK, I will remove pci_address check code. >=20 >=20 > > "R.*T.*E.*>.*>", self.start_test_time) > > out =3D self.dut.send_expect("dump_devargs", "RTE>>", > > self.run_cmd_time * 2) > > self.dut.send_expect("quit", "# ") > > - black_str =3D "PCI blacklist %s" % > > self.dut.ports_info[test_port]['pci'] > > + black_str =3D "PCI blacklist %s" % pci_address > > self.verify(black_str in out, "Dump black list failed") > > > > self.dut.send_expect("./%s/app/test -n 1 -c ffff -w %s" > > - % (self.target, > > self.dut.ports_info[test_port]['pci']), "R.*T.*E.*>.*>", > > self.start_test_time) > > + % (self.target, pci_address), > > "R.*T.*E.*>.*>", self.start_test_time) > > out =3D self.dut.send_expect("dump_devargs", "RTE>>", > > self.run_cmd_time * 2) > > self.dut.send_expect("quit", "# ") > > > > - white_str =3D "PCI whitelist %s" % > > self.dut.ports_info[test_port]['pci'] > > + white_str =3D "PCI whitelist %s" % pci_address > > self.verify(white_str in out, "Dump white list failed") > > > > def tear_down(self): > > -- > > 1.9.3