Re: [dts] [PATCH V1] tests:remove ethtool from kni

["Tu, Lijuan" <lijuan.tu@intel.com>]

Could you please rework your patch?

Applying: tests:remove ethtool from kni
error: patch failed: tests/TestSuite_kni.py:649
error: tests/TestSuite_kni.py: patch does not apply
Patch failed at 0001 tests:remove ethtool from kni

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of changqingxwu
> Sent: Wednesday, June 19, 2019 10:37 AM
> To: dts@dpdk.org
> Cc: Wu, ChangqingX <changqingx.wu@intel.com>
> Subject: [dts] [PATCH V1] tests:remove ethtool from kni
> 
> remove test case ethtool from kni
> 
> Signed-off-by: changqingxwu <changqingx.wu@intel.com>
> ---
>  tests/TestSuite_kni.py | 87 ------------------------------------------
>  1 file changed, 87 deletions(-)
> 
> diff --git a/tests/TestSuite_kni.py b/tests/TestSuite_kni.py index
> aa189f5..0d8aaf6 100644
> --- a/tests/TestSuite_kni.py
> +++ b/tests/TestSuite_kni.py
> @@ -649,93 +649,6 @@ class TestKni(TestCase):
>              self.verify("%d packets captured" % len(packets_to_send) in out,
>                          "Wrong number of packets captured")
> 
> -    def test_ethtool(self):
> -        """
> -        Ethtool support KNI.
> -        """
> -
> -        # Ports and cores configuration set in set_up_all function
> -        # For each virtual interface perform the following operations
> -        for port in self.config['ports']:
> -
> -            virtual_interface = self.virtual_interface_name(port)
> -
> -            # Request settings
> -            out = self.dut.send_expect("ethtool %s" % virtual_interface,
> -                                       "# ")
> -            self.verify("Settings for %s" % virtual_interface in out,
> -                        "ethtool not supported")
> -            self.verify("Operation not supported" not in out,
> -                        "ethtool not supported")
> -
> -            # Request driver information
> -            out = self.dut.send_expect("ethtool -i %s" % virtual_interface,
> -                                       "# ")
> -            self.verify("driver: ixgbe" or "driver: igb" in out,
> -                        "'ethtool -i' not supported")
> -            self.verify("Operation not supported" not in out,
> -                        "'ethtool -i' not supported")
> -
> -            # Request pause parameters
> -            with open("/usr/include/linux/ethtool.h","r") as ethtool_h:
> -                ethtool_contents = ethtool_h.read()
> -                GSET = "ETHTOOL_GLINKSETTINGS"
> -                SSET = "ETHTOOL_SLINKSETTINGS"
> -                if (GSET in ethtool_contents) and (SSET in ethtool_contents):
> -                    out = self.dut.send_expect("ethtool -a %s" % virtual_interface,
> -                                               "# ")
> -                    self.verify("Pause parameters for %s" % virtual_interface in out,
> -                                "'ethtool -a' not supported")
> -                    self.verify("Operation not supported" not in out,
> -                                "ethtool '-a' not supported")
> -
> -            # Request statistics
> -            out = self.dut.send_expect("ethtool -S %s" % virtual_interface,
> -                                       "# ")
> -            self.verify("NIC statistics" in out,
> -                        "'ethtool -S' not supported")
> -            self.verify("Operation not supported" not in out,
> -                        "ethtool '-S' not supported")
> -
> -            # Request features status
> -            out = self.dut.send_expect("ethtool -k %s" % virtual_interface, "# ")
> -            self.verify(("Features for %s" % virtual_interface in out) or
> -                        ("Offload parameters for %s" %
> -                         virtual_interface in out),
> -                        "'ethtool -k' not supported")
> -            self.verify("Operation not supported" not in out,
> -                        "'ethtool -k' not supported")
> -
> -            # Request ring parameters
> -            out = self.dut.send_expect("ethtool -g %s" % virtual_interface,
> -                                       "# ")
> -            self.verify("Ring parameters for %s" % virtual_interface in out,
> -                        "'ethtool -g' not supported")
> -            self.verify("Operation not supported" not in out,
> -                        "'ethtool -g' not supported")
> -
> -            # Request coalesce parameters. NOT SUPPORTED
> -            out = self.dut.send_expect("ethtool -c %s" % virtual_interface,
> -                                       "# ")
> -            self.verify("Operation not supported" in out,
> -                        "'ethtool -c' seems to be supported. Check it.")
> -
> -            # Request register dump
> -            out = self.dut.send_expect("ethtool -d %s" % virtual_interface,
> -                                       "# ")
> -            expectstring = "0x00000: CTRL.*0x00008: STATUS"
> -            self.verify(len(re.findall(expectstring, out , re.DOTALL)) > 0, "'ethtool -
> d' not supported")
> -            self.verify("Operation not supported" not in out,
> -                        "'ethtool -d' not supported")
> -
> -            # Request eeprom dump
> -            out = self.dut.send_expect("ethtool -e %s" % virtual_interface,
> -                                       "# ")
> -            self.verify("Offset" and "Values" in out,
> -                        "'ethtool -e' not support")
> -            self.verify("Operation not supported" not in out,
> -                        "'ethtool -e' not support")
> -
>      def test_statistics(self):
>          """
>          KNI Statistics test.
> --
> 2.17.2