[dts] [PATCH V1]userspace_ethtool: update automation testing script

[dts] [PATCH V1]userspace_ethtool: update automation testing script

[yufengmx]

*. fix relative path to absolute path for eeprom checking 

yufengmx (1):
  userspace_ethtool: update automation testing script

 tests/TestSuite_userspace_ethtool.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

-- 
1.9.3

[dts] [PATCH V1]userspace_ethtool: update automation testing script

[yufengmx]

fix relative path to absolute path for eeprom checking

Signed-off-by: yufengmx <yufengx.mo@intel.com>
---
 tests/TestSuite_userspace_ethtool.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/TestSuite_userspace_ethtool.py b/tests/TestSuite_userspace_ethtool.py
index ced7e96..a03d7e0 100644
--- a/tests/TestSuite_userspace_ethtool.py
+++ b/tests/TestSuite_userspace_ethtool.py
@@ -129,23 +129,26 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
             return 1518
 
     def resize_linux_eeprom_file(self, dpdk_eeprom_file, linux_eeprom_file):
-        basePath = os.sep + "root" + self.dut.base_dir[1:] + os.sep
+        if self.dut.base_dir.startswith('~'):
+            basePath = "/root" + self.dut.base_dir[1:]
+        else:
+            basePath = self.dut.base_dir
         with open( basePath + os.sep + dpdk_eeprom_file, 'rb') as fpDpdk:
             dpdk_bytes = fpDpdk.read()
             dpdk_length = len(dpdk_bytes)
 
-        with open( basePath + linux_eeprom_file, 'rb') as fplinux:
+        with open( basePath + os.sep + linux_eeprom_file, 'rb') as fplinux:
             linux_bytes = fplinux.read()
             linux_length = len(linux_bytes)
         
         self.verify(dpdk_length <= linux_length, 
                     "linux ethtool haven't dump out enough data as dpdk ethtool")
 
-        with open( basePath + linux_eeprom_file, 'wb') as fplinux:
+        with open( basePath + os.sep + linux_eeprom_file, 'wb') as fplinux:
             fplinux.write(linux_bytes[:dpdk_length])
 
     def strip_md5(self, filename):
-        md5_info = self.dut.send_expect("md5sum %s" % filename, "# ")
+        md5_info = self.dut.send_expect("md5sum %s" % ( self.dut.base_dir + os.sep + filename), "# ", 30)
         md5_pattern = r"(\w+)  (\w+)"
         m = re.match(md5_pattern, md5_info)
         if m:
-- 
1.9.3

Re: [dts] [PATCH V1]userspace_ethtool: update automation testing script

[Liu, Yong]

Thanks, applied into master branch.

On 01/04/2017 11:42 AM, yufengmx wrote:
> fix relative path to absolute path for eeprom checking
>
> Signed-off-by: yufengmx<yufengx.mo@intel.com>
> ---
>   tests/TestSuite_userspace_ethtool.py | 11 +++++++----
>   1 file changed, 7 insertions(+), 4 deletions(-)

Re: [dts] [PATCH V1]userspace_ethtool: update automation testing script

[Mo, YufengX]

hi, 

this patch should be ignored.

> -----Original Message-----
> From: Liu, Yong
> Sent: January 16, 2017 10:34 AM
> To: Mo, YufengX; dts@dpdk.org
> Subject: Re: [dts] [PATCH V1]userspace_ethtool: update automation testing script
> 
> Thanks, applied into master branch.
> 
> On 01/04/2017 11:42 AM, yufengmx wrote:
> > fix relative path to absolute path for eeprom checking
> >
> > Signed-off-by: yufengmx<yufengx.mo@intel.com>
> > ---
> >   tests/TestSuite_userspace_ethtool.py | 11 +++++++----
> >   1 file changed, 7 insertions(+), 4 deletions(-)

Re: [dts] [PATCH V1]userspace_ethtool: update automation testing script

[Liu, Yong]

Ok, removed this patch.

> -----Original Message-----
> From: Mo, YufengX
> Sent: Monday, January 16, 2017 10:39 AM
> To: Liu, Yong <yong.liu@intel.com>; dts@dpdk.org
> Subject: RE: [dts] [PATCH V1]userspace_ethtool: update automation testing
> script
> Importance: Low
> 
> hi,
> 
> this patch should be ignored.
> 
> > -----Original Message-----
> > From: Liu, Yong
> > Sent: January 16, 2017 10:34 AM
> > To: Mo, YufengX; dts@dpdk.org
> > Subject: Re: [dts] [PATCH V1]userspace_ethtool: update automation testing
> script
> >
> > Thanks, applied into master branch.
> >
> > On 01/04/2017 11:42 AM, yufengmx wrote:
> > > fix relative path to absolute path for eeprom checking
> > >
> > > Signed-off-by: yufengmx<yufengx.mo@intel.com>
> > > ---
> > >   tests/TestSuite_userspace_ethtool.py | 11 +++++++----
> > >   1 file changed, 7 insertions(+), 4 deletions(-)