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 775F1A00C3; Thu, 14 May 2020 05:00:59 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 413541D679; Thu, 14 May 2020 05:00:59 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 3082F1D65A for ; Thu, 14 May 2020 05:00:57 +0200 (CEST) IronPort-SDR: bf9T7TcWWqIxSppKAGOAuf6Kr7kIrqbg2Rj/CA8JxBfHehUpbxt9XKEzkn9xbKnPrpy3PUZRZD +VVBKwUoghdA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2020 20:00:56 -0700 IronPort-SDR: 16Euxb7lIqrglZaMCGbwmGiSiipIDLV3GVYOxupVCQumAh2NrDvXun+e6Fn3kSLhvgt4Hb6a4c T5eWnDfVOaDg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,390,1583222400"; d="scan'208";a="280711847" Received: from unknown (HELO dpdk-wenjielx-dtspatch135.sh.intel.com) ([10.240.183.135]) by orsmga002.jf.intel.com with ESMTP; 13 May 2020 20:00:54 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Thu, 14 May 2020 10:56:55 +0800 Message-Id: <1589425015-15694-1-git-send-email-xix.zhang@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dts] [PATCH V1] tests/TestSuite_blacklist:Modify the verification method of blacklist equipment 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" Echo changes after testpmd starts,Modify the verification method of blacklist equipment Signed-off-by: xizhan4x --- tests/TestSuite_blacklist.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/tests/TestSuite_blacklist.py b/tests/TestSuite_blacklist.py index eb56759..64360bb 100644 --- a/tests/TestSuite_blacklist.py +++ b/tests/TestSuite_blacklist.py @@ -36,6 +36,7 @@ Test device blacklisting. import utils from test_case import TestCase from pmd_output import PmdOutput +from settings import DRIVERS class TestBlackList(TestCase): def set_up_all(self): @@ -48,11 +49,7 @@ class TestBlackList(TestCase): self.ports = self.dut.get_ports(self.nic) self.verify(len(self.ports) >= 2, "Insufficient ports for testing") [arch, machine, self.env, toolchain] = self.target.split('-') - - if self.env == 'bsdapp': - self.regexp_blacklisted_port = "EAL: PCI device 0000:%02x:%s on NUMA socket [-0-9]+[^\n]*\nEAL: Device is blacklisted, not initializing" - else: - self.regexp_blacklisted_port = "EAL: PCI device %s on NUMA socket [-0-9]+[^\n]*\nEAL: Device is blacklisted, not initializing" + self.regexp_blacklisted_port = "Probe PCI driver: net_%s \(%s\) device: %s \(socket [-0-9]+\)" self.pmdout = PmdOutput(self.dut) def set_up(self): @@ -73,17 +70,18 @@ class TestBlackList(TestCase): # Look for the PCI ID of each card followed by # "Device is blacklisted, not initializing" but avoid to consume more # than one device. - if self.env == 'bsdapp': - pci = self.dut.ports_info[port]['pci'] - regexp_blacklisted_port = self.regexp_blacklisted_port % (int(pci.split(':')[0], 16), pci.split(':')[1]) - else: - regexp_blacklisted_port = self.regexp_blacklisted_port % self.dut.ports_info[port]['pci'] + port_pci = self.dut.ports_info[port]['pci'] + if self.env == "bsdapp": + port_pci = ':'.join(["0000", port_pci]) + regexp_blacklisted_port = self.regexp_blacklisted_port % ( + DRIVERS.get(self.nic), self.dut.ports_info[port]['type'], + port_pci) matching_ports = utils.regexp(output, regexp_blacklisted_port, True) if blacklisted: - self.verify(len(matching_ports) == 1, + self.verify(len(matching_ports) == 0, "Blacklisted port is being initialized") else: - self.verify(len(matching_ports) == 0, + self.verify(len(matching_ports) == 1, "Not blacklisted port is being blacklisted") def test_bl_noblacklisted(self): -- 2.17.2