[dts] [PATCH V2]Ethtool: update automation testing script

[Liu, Yong]

Thanks, applied.

> -----Original Message-----
> From: dts [mailto:dts-bounces at dpdk.org] On Behalf Of Yufen Mo
> Sent: Wednesday, July 27, 2016 2:42 PM
> To: dts at dpdk.org
> Cc: Mo, YufengX
> Subject: [dts] [PATCH V2]Ethtool: update automation testing script
> 
> From: yufengmx <yufengx.mo at intel.com>
> 
> *. 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 <yufengx.mo at intel.com>
> ---
>  tests/TestSuite_userspace_ethtool.py | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/tests/TestSuite_userspace_ethtool.py
> b/tests/TestSuite_userspace_ethtool.py
> index c718a58..26044a3 100644
> --- a/tests/TestSuite_userspace_ethtool.py
> +++ b/tests/TestSuite_userspace_ethtool.py
> @@ -128,8 +128,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 +220,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 +303,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 +318,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