[dts] [PATCH V2] tests/TestSuite_userspace_ethtool.py:Before the exception exit, it needs to be re-bound to the DPDK.

[dts] [PATCH V2] tests/TestSuite_userspace_ethtool.py:Before the exception exit, it needs to be re-bound to the DPDK.

[Peng Zhihong]

tests/TestSuite_userspace_ethtool.py:Before the exception exit, it needs to be re-bound to the DPDK.

Signed-off-by: Peng Zhihong <zhihongx.peng@intel.com>
---
 tests/TestSuite_userspace_ethtool.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/tests/TestSuite_userspace_ethtool.py b/tests/TestSuite_userspace_ethtool.py
index 92724aa..31f8a87 100644
--- a/tests/TestSuite_userspace_ethtool.py
+++ b/tests/TestSuite_userspace_ethtool.py
@@ -247,12 +247,9 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
             sys_nic_info = self.linux_get_nic_info(intf_name)
             status, msg = self.check_driver_info(intf_name, sys_nic_info, dpdk_nic_infos[str(index)])
             self.logger.info(msg)
-            self.verify(status, msg)
-
-        for index in range(len(self.ports)):
             # bind to original driver
-            portinfo = portsinfo[index]
             portinfo['net_dev'].bind_driver(portinfo['ori_driver'])
+            self.verify(status, msg)
 
         self.dut.send_expect(self.cmd, "EthApp>", 60)
         # ethtool doesn't support port disconnect by tools of linux 
@@ -335,12 +332,9 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
             # get linux interface
             intf = netdev.get_interface_name()
             out = self.dut.send_expect("ethtool -d %s raw off file %s" % (intf, portinfo['reg_file']), "# ")
-            self.verify(("register" in out and "CTRL" in out), "Failed to dump %s registers" % intf)
-
-        for index in range(len(self.ports)):
             # bind to original driver
-            portinfo = portsinfo[index]
             portinfo['net_dev'].bind_driver(portinfo['ori_driver'])
+            self.verify(("register" in out and "CTRL" in out), "Failed to dump %s registers" % intf)
 
     def test_retrieve_eeprom(self):
         """
-- 
2.17.1

Re: [dts] [PATCH V2] tests/TestSuite_userspace_ethtool.py:Before the exception exit, it needs to be re-bound to the DPDK.

[Tu, Lijuan]

Applied, thanks

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Peng Zhihong
> Sent: Tuesday, November 5, 2019 11:31 AM
> To: dts@dpdk.org
> Cc: Peng, ZhihongX <zhihongx.peng@intel.com>
> Subject: [dts] [PATCH V2] tests/TestSuite_userspace_ethtool.py:Before the
> exception exit, it needs to be re-bound to the DPDK.
> 
> tests/TestSuite_userspace_ethtool.py:Before the exception exit, it needs to
> be re-bound to the DPDK.
> 
> Signed-off-by: Peng Zhihong <zhihongx.peng@intel.com>
> ---
>  tests/TestSuite_userspace_ethtool.py | 10 ++--------
>  1 file changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/tests/TestSuite_userspace_ethtool.py
> b/tests/TestSuite_userspace_ethtool.py
> index 92724aa..31f8a87 100644
> --- a/tests/TestSuite_userspace_ethtool.py
> +++ b/tests/TestSuite_userspace_ethtool.py
> @@ -247,12 +247,9 @@ class TestUserspaceEthtool(TestCase,
> IxiaPacketGenerator):
>              sys_nic_info = self.linux_get_nic_info(intf_name)
>              status, msg = self.check_driver_info(intf_name, sys_nic_info,
> dpdk_nic_infos[str(index)])
>              self.logger.info(msg)
> -            self.verify(status, msg)
> -
> -        for index in range(len(self.ports)):
>              # bind to original driver
> -            portinfo = portsinfo[index]
>              portinfo['net_dev'].bind_driver(portinfo['ori_driver'])
> +            self.verify(status, msg)
> 
>          self.dut.send_expect(self.cmd, "EthApp>", 60)
>          # ethtool doesn't support port disconnect by tools of linux @@ -335,12
> +332,9 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
>              # get linux interface
>              intf = netdev.get_interface_name()
>              out = self.dut.send_expect("ethtool -d %s raw off file %s" % (intf,
> portinfo['reg_file']), "# ")
> -            self.verify(("register" in out and "CTRL" in out), "Failed to dump %s
> registers" % intf)
> -
> -        for index in range(len(self.ports)):
>              # bind to original driver
> -            portinfo = portsinfo[index]
>              portinfo['net_dev'].bind_driver(portinfo['ori_driver'])
> +            self.verify(("register" in out and "CTRL" in out), "Failed
> + to dump %s registers" % intf)
> 
>      def test_retrieve_eeprom(self):
>          """
> --
> 2.17.1