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 05755A00E6 for ; Wed, 10 Jul 2019 08:30:50 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C5EBC4C94; Wed, 10 Jul 2019 08:30:50 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 801024C8E for ; Wed, 10 Jul 2019 08:30:48 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Jul 2019 23:30:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,473,1557212400"; d="scan'208";a="249372813" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga001.jf.intel.com with ESMTP; 09 Jul 2019 23:30:47 -0700 Received: from FMSMSX109.amr.corp.intel.com (10.18.116.9) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 9 Jul 2019 23:30:47 -0700 Received: from shsmsx108.ccr.corp.intel.com (10.239.4.97) by fmsmsx109.amr.corp.intel.com (10.18.116.9) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 9 Jul 2019 23:30:46 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX108.ccr.corp.intel.com ([169.254.8.174]) with mapi id 14.03.0439.000; Wed, 10 Jul 2019 14:30:45 +0800 From: "Tu, Lijuan" To: "Peng, Yuan" , "dts@dpdk.org" CC: "Peng, Yuan" Thread-Topic: [dts] [PATCH] tests: remove a test case from TestSuite_vlan.py Thread-Index: AQHVLAeB67q9Zu/SSkiwET3TT+kTcqbDeebA Date: Wed, 10 Jul 2019 06:30:44 +0000 Message-ID: <8CE3E05A3F976642AAB0F4675D0AD20E0BADEBE0@SHSMSX101.ccr.corp.intel.com> References: <1561544136-73369-1-git-send-email-yuan.peng@intel.com> In-Reply-To: <1561544136-73369-1-git-send-email-yuan.peng@intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMWIwZTg3MzUtMDdmMy00NWY3LThlZmEtYmJlNDllYzU2NjEyIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiNVI4c01BZDBTRVRUVzJvaTR1c3B1aEtHTEpRVGlLbWVHRWoyd05tekxtN3JFV2c5Y0wwbFVaS1lPdEp2Vkh0MiJ9 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] tests: remove a test case from TestSuite_vlan.py 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" Applying: tests: remove a test case from TestSuite_vlan.py error: patch failed: tests/TestSuite_vlan.py:73 error: tests/TestSuite_vlan.py: patch does not apply Patch failed at 0001 tests: remove a test case from TestSuite_vlan.py > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Peng Yuan > Sent: Wednesday, June 26, 2019 6:16 PM > To: dts@dpdk.org > Cc: Peng, Yuan > Subject: [dts] [PATCH] tests: remove a test case from TestSuite_vlan.py >=20 > Remove a test case from TestSuite_vlan.py >=20 > Signed-off-by: Peng Yuan >=20 > diff --git a/tests/TestSuite_vlan.py b/tests/TestSuite_vlan.py index > 4bf0ae8..421efc6 100644 > --- a/tests/TestSuite_vlan.py > +++ b/tests/TestSuite_vlan.py > @@ -73,14 +73,10 @@ class TestVlan(TestCase): > self.pmdout.start_testpmd("Default", "--portmask=3D%s --port- > topology=3Dloop" % portMask) >=20 > self.dut.send_expect("set verbose 1", "testpmd> ") > - out =3D self.dut.send_expect("set fwd mac", "testpmd> ") > - > - if self.nic in ["fortville_eagle", "fortville_spirit", "fortvill= e_spirit_single", > "fortpark_TLV", "fortville_25g"]: > - self.dut.send_expect("vlan set filter on %s" % dutRxPortId, = "testpmd> > ") > - self.dut.send_expect("set promisc all off", "testpmd> ") > - > + self.dut.send_expect("set fwd mac", "testpmd> ") > + self.dut.send_expect("set promisc all off", "testpmd> ") > + self.dut.send_expect("vlan set filter on %s" % dutRxPortId, > + "testpmd> ") > self.dut.send_expect("vlan set strip off %s" % dutRxPortId, "tes= tpmd> ") > - self.verify('Set mac packet forwarding mode' in out, "set fwd rx= only > error") > self.vlan =3D 51 >=20 > if self.kdriver =3D=3D "fm10k": > @@ -97,7 +93,7 @@ class TestVlan(TestCase): >=20 > def vlan_send_packet(self, vid, num=3D1): > """ > - Send $num of packet to portid, if vid is -1, it means send pakca= ge not > include vlan id. > + Send $num of packets to portid, if vid is -1, it means send a pa= cket > which does not include a vlan id. > """ > # The package stream : testTxPort->dutRxPort->dutTxport->testRxP= ort > port =3D self.tester.get_local_port(dutRxPortId) > @@ -128,9 +124,9 @@ class TestVlan(TestCase): > """ > pass >=20 > - def test_vlan_enable_receipt(self): > + def test_vlan_enable_receipt_strip_off(self): > """ > - Enable receipt of VLAN packets > + Enable receipt of VLAN packets and strip off > """ >=20 > if self.kdriver =3D=3D "fm10k": > @@ -140,18 +136,24 @@ class TestVlan(TestCase): > self.dut.send_expect("vlan set strip off %s" % dutRxPortId, "te= stpmd> ") > self.dut.send_expect("start", "testpmd> ", 120) > out =3D self.dut.send_expect("show port info %s" % dutRxPortId, > "testpmd> ", 20) > + self.verify("strip off" in out, "Wrong strip:" + out) >=20 > self.vlan_send_packet(self.vlan) > out =3D self.get_tcpdump_package() > self.verify(self.vlan in out, "Wrong vlan:" + str(out)) >=20 > + notmatch_vlan =3D self.vlan + 1 > + self.vlan_send_packet(notmatch_vlan) > + out =3D self.get_tcpdump_package() > + self.verify(len(out) =3D=3D 0, "Received unexpected packet, filt= er not > work!!!") > + self.verify(notmatch_vlan not in out, "Wrong vlan:" + str(out)) > + > self.dut.send_expect("stop", "testpmd> ") >=20 > def test_vlan_disable_receipt(self): > """ > Disable receipt of VLAN packets > """ > - self.dut.send_expect("vlan set filter on %s" % dutRxPortId, "tes= tpmd> ") >=20 > self.dut.send_expect("rx_vlan rm %d %s" % (self.vlan, dutRxPortI= d), > "testpmd> ") > self.dut.send_expect("start", "testpmd> ", 120) @@ -161,9 +163,1= 2 @@ > class TestVlan(TestCase): > self.verify(len(out) =3D=3D 0, "Received unexpected packet, filt= er not > work!!!") > self.verify(self.vlan not in out, "Wrong vlan:" + str(out)) >=20 > - out =3D self.dut.send_expect("stop", "testpmd> ") > + self.dut.send_expect("stop", "testpmd> ") >=20 > - def test_vlan_strip_config_on(self): > + def test_vlan_enable_receipt_strip_on(self): > + """ > + Enable receipt of VLAN packets and strip on > + """ >=20 > self.dut.send_expect("vlan set strip on %s" % dutRxPortId, "test= pmd> ", > 20) > self.dut.send_expect("rx_vlan add %d %s" % (self.vlan, dutRxPort= Id), > "testpmd> ", 20) @@ -175,23 +180,8 @@ class TestVlan(TestCase): > out =3D self.get_tcpdump_package() > self.verify(len(out), "Forwarded vlan packet not received!!!") > self.verify(self.vlan not in out, "Wrong vlan:" + str(out)) > - out =3D self.dut.send_expect("stop", "testpmd> ", 120) > - > - def test_vlan_strip_config_off(self): > - > - if self.kdriver =3D=3D "fm10k": > - print utils.RED("fm10k not support this case\n") > - return > + self.dut.send_expect("stop", "testpmd> ", 120) > self.dut.send_expect("vlan set strip off %s" % dutRxPortId, "tes= tpmd> ", > 20) > - self.dut.send_expect("rx_vlan add %d %s" % (self.vlan, dutRxPort= Id), > "testpmd> ", 20) > - out =3D self.dut.send_expect("show port info %s" % dutRxPortId, > "testpmd> ", 20) > - self.verify("strip off" in out, "Wrong strip:" + out) > - self.dut.send_expect("set nbport 2", "testpmd> ") > - self.dut.send_expect("start", "testpmd> ", 120) > - self.vlan_send_packet(self.vlan) > - out =3D self.get_tcpdump_package() > - self.verify(self.vlan in out, "Vlan not found:" + str(out)) > - out =3D self.dut.send_expect("stop", "testpmd> ", 120) >=20 > def test_vlan_enable_vlan_insertion(self): > """ > @@ -202,10 +192,6 @@ class TestVlan(TestCase): > netobj.add_vlan(vlan_id =3D self.vlan) > netobj.add_txvlan(vlan_id =3D self.vlan) >=20 > - port =3D self.tester.get_local_port(dutTxPortId) > - intf =3D self.tester.get_interface(port) > - > - self.dut.send_expect("set nbport 2", "testpmd> ") > self.dut.send_expect("stop", "testpmd> ") > self.dut.send_expect("port stop all", "testpmd> ") > self.dut.send_expect("tx_vlan set %s %d" % (dutTxPortId, self.vl= an), > "testpmd> ") > -- > 2.14.3