From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 11CB74CE7 for ; Wed, 27 Jul 2016 09:12:53 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP; 27 Jul 2016 00:12:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,428,1464678000"; d="scan'208";a="1003318569" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga001.jf.intel.com with ESMTP; 27 Jul 2016 00:12:39 -0700 Received: from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com [10.239.29.90]) by shvmail01.sh.intel.com with ESMTP id u6R7Cbkg019693; Wed, 27 Jul 2016 15:12:37 +0800 Received: from shecgisg003.sh.intel.com (localhost [127.0.0.1]) by shecgisg003.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id u6R7CZ5X005602; Wed, 27 Jul 2016 15:12:37 +0800 Received: (from yufengmx@localhost) by shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id u6R7CYjb005598; Wed, 27 Jul 2016 15:12:34 +0800 From: Yufen Mo To: dts@dpdk.org Cc: yufengmx Date: Wed, 27 Jul 2016 15:12:30 +0800 Message-Id: <1469603550-5560-2-git-send-email-yufengx.mo@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1469603550-5560-1-git-send-email-yufengx.mo@intel.com> References: <1469603550-5560-1-git-send-email-yufengx.mo@intel.com> Subject: [dts] [PATCH V4]Ethtool: update automation testing script 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: Wed, 27 Jul 2016 07:12:54 -0000 From: yufengmx *. close eeprom test case on FVL for FVL series firmware not supported *. reset ring parameter after ring parameter is used *. set testing content the same user space ethtool dumped Signed-off-by: yufengmx --- tests/TestSuite_userspace_ethtool.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/TestSuite_userspace_ethtool.py b/tests/TestSuite_userspace_ethtool.py index c718a58..2346e3b 100644 --- a/tests/TestSuite_userspace_ethtool.py +++ b/tests/TestSuite_userspace_ethtool.py @@ -34,6 +34,7 @@ DPDK Test suite. Test support of userspace ethtool feature """ +import os import dts import time import re @@ -128,8 +129,8 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator): return 1518 def resize_linux_eeprom_file(self, dpdk_eeprom_file, linux_eeprom_file): - basePath = self.dut.base_dir - with open( basePath + dpdk_eeprom_file, 'rb') as fpDpdk: + basePath = os.sep + "root" + self.dut.base_dir[1:] + os.sep + with open( basePath + os.sep + dpdk_eeprom_file, 'rb') as fpDpdk: dpdk_bytes = fpDpdk.read() dpdk_length = len(dpdk_bytes) @@ -220,7 +221,10 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator): portsinfo = [] ori_drivers = [] - + + if self.nic.startswith("fortville"): + return + for portid in range(len(self.ports)): self.dut.send_expect("regs %d regs_%d.bin" % (portid, portid), "EthApp>") portinfo = {'portid': portid, 'reg_file': 'regs_%d.bin' % portid} @@ -300,8 +304,8 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator): """ Test ethtool app ring parameter getting and setting """ - self.dut.send_expect(self.cmd, "EthApp>", 60) for index in range(len(self.ports)): + self.dut.send_expect(self.cmd, "EthApp>", 60) port = self.ports[index] ori_rx_pkts, ori_tx_pkts = self.strip_portstats(port) _, rx_max, _, tx_max = self.strip_ringparam(index) @@ -315,8 +319,7 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator): pkt.send_pkt(tx_port=intf) rx_pkts, tx_pkts = self.strip_portstats(index) self.verify(rx_pkts == ori_rx_pkts + 1, "Failed to forward after ring parameter changed") - - self.dut.send_expect("quit", "# ") + self.dut.send_expect("quit", "# ") def test_ethtool_vlan(self): """ -- 1.9.3