From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 0560CF94E for ; Thu, 12 Jan 2017 09:46:06 +0100 (CET) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP; 12 Jan 2017 00:46:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,349,1477983600"; d="scan'208";a="1111480955" Received: from unknown (HELO dpdk-fedora20.icx.intel.com) ([10.240.176.135]) by fmsmga002.fm.intel.com with ESMTP; 12 Jan 2017 00:45:56 -0800 From: "xu,huilong" To: dts@dpdk.org Cc: "xu,huilong" Date: Thu, 12 Jan 2017 16:46:57 +0800 Message-Id: <1484210817-42185-2-git-send-email-huilongx.xu@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1484210817-42185-1-git-send-email-huilongx.xu@intel.com> References: <1484210817-42185-1-git-send-email-huilongx.xu@intel.com> Subject: [dts] [patch V2 2/2] used check_tx_bytes for check tx_bytes in test case 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: Thu, 12 Jan 2017 08:46:07 -0000 Signed-off-by: xu,huilong --- tests/TestSuite_jumboframes.py | 5 ++++- tests/TestSuite_pmd.py | 4 ++-- tests/TestSuite_shutdown_api.py | 15 +++++++++------ 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/tests/TestSuite_jumboframes.py b/tests/TestSuite_jumboframes.py index 58f2e17..bc6e70d 100644 --- a/tests/TestSuite_jumboframes.py +++ b/tests/TestSuite_jumboframes.py @@ -39,6 +39,7 @@ import re from time import sleep from test_case import TestCase from pmd_output import PmdOutput +from settings import PROTOCOL_PACKET_SIZE ETHER_HEADER_LEN = 18 IP_HEADER_LEN = 20 @@ -93,7 +94,9 @@ class TestJumboframes(TestCase): rx_err -= rx_err_ori if received: - self.verify((tx_pkts == rx_pkts) and ((tx_bytes + 4) == pktsize) and ((rx_bytes + 4) == pktsize), + self.verify(self.pmdout.check_tx_bytes(tx_pkts, rx_pkts) + and ( self.pmdout.check_tx_bytes(tx_bytes + 4, pktsize )) + and ((rx_bytes + 4) == pktsize), "packet pass assert error") else: #self.verify(p0tx_pkts == p1rx_pkts and (p1rx_err == 1 or p1rx_pkts == 0), diff --git a/tests/TestSuite_pmd.py b/tests/TestSuite_pmd.py index 7b9e6b5..bc59849 100644 --- a/tests/TestSuite_pmd.py +++ b/tests/TestSuite_pmd.py @@ -364,13 +364,13 @@ class TestPmd(TestCase,IxiaPacketGenerator): time.sleep(5) - self.verify(p0tx_pkts == p1rx_pkts, + self.verify(self.pmdout.check_tx_bytes(p0tx_pkts, p1rx_pkts), "packet pass assert error, %d RX packets, %d TX packets" % (p1rx_pkts, p0tx_pkts)) self.verify(p1rx_bytes == frame_size - 4, "packet pass assert error, expected %d RX bytes, actual %d" % (frame_size - 4, p1rx_bytes)) - self.verify(p0tx_bytes == frame_size - 4, + self.verify(self.pmdout.check_tx_bytes(p0tx_bytes, frame_size - 4), "packet pass assert error, expected %d TX bytes, actual %d" % (frame_size - 4, p0tx_bytes)) return out diff --git a/tests/TestSuite_shutdown_api.py b/tests/TestSuite_shutdown_api.py index 3dbacf2..66219f5 100644 --- a/tests/TestSuite_shutdown_api.py +++ b/tests/TestSuite_shutdown_api.py @@ -42,7 +42,7 @@ import re import os from test_case import TestCase from pmd_output import PmdOutput -from settings import HEADER_SIZE +from settings import HEADER_SIZE, PROTOCOL_PACKET_SIZE from exception import VerifyFailure # @@ -149,14 +149,17 @@ class TestShutdownApi(TestCase): if vlan is True: # vlan strip default is on tx_bytes_exp -= 4 - + + # fortville nic enable send lldp packet function when port setup + # now the tx-packets size is lldp_size(110) * n + forward packe size + # so use (tx-packets - forward packet size) % lldp_size, if it is 0, it means forward packet size right + if received: - self.verify(p0tx_pkts == p1rx_pkts, "Wrong TX pkts p0_tx=%d, p1_rx=%d" % (p0tx_pkts, p1rx_pkts)) + self.verify(self.pmdout.check_tx_bytes(p0tx_pkts, p1rx_pkts), "Wrong TX pkts p0_tx=%d, p1_rx=%d" % (p0tx_pkts, p1rx_pkts)) self.verify(p1rx_bytes == rx_bytes_exp, "Wrong Rx bytes p1_rx=%d, expect=%d" % (p1rx_bytes, rx_bytes_exp)) - self.verify(p0tx_bytes == tx_bytes_exp, "Wrong Tx bytes p0_tx=%d, expect=%d" % (p0tx_bytes, tx_bytes_exp)) + self.verify(self.pmdout.check_tx_bytes(p0tx_bytes, tx_bytes_exp) , "Wrong Tx bytes p0_tx=%d, expect=%d" % (p0tx_bytes, tx_bytes_exp)) else: - self.verify(p0tx_pkts == 0, "Packet not dropped p0tx_pkts=%d" % p0tx_pkts) - self.verify(p0tx_bytes == 0, "Packet not dropped p0tx_bytes=%d" % p0tx_bytes) + self.verify(self.pmdout.check_tx_bytes(p0tx_pkts), "Packet not dropped p0tx_pkts=%d" % p0tx_pkts) def check_ports(self, status=True): """ -- 1.9.3