test suite reviews and discussions
 help / color / mirror / Atom feed
* [dts] [PATCH] bug fix: fix issue when DTS run on Fedora21 and freebsd
@ 2015-02-27  7:09 Yong Liu
  2015-02-28  3:22 ` Zhang, XiaonanX
  0 siblings, 1 reply; 8+ messages in thread
From: Yong Liu @ 2015-02-27  7:09 UTC (permalink / raw)
  To: dts

Some nic like FVL have more than only one interface on Fedora21, DTS will take
the first one as functional one. Not all OS has alias "ll" available, use "ls"
in replace of it.

Signed-off-by: Marvinliu <yong.liu@intel.com>

diff --git a/framework/crb.py b/framework/crb.py
index 28df2f9..a699bfc 100644
--- a/framework/crb.py
+++ b/framework/crb.py
@@ -191,7 +191,12 @@ class Crb(object):
         Get interface name of specified pci device on linux.
         """
         command = 'ls --color=never /sys/bus/pci/devices/0000:%s:%s/net' % (bus_id, devfun_id)
-        return self.send_expect(command, '# ')
+        out = self.send_expect(command, '# ', verify=True)
+        if out == -1:
+            name = ""
+        else:
+            name = out.split()[0]
+        return name
 
     def get_interface_name_freebsd(self, bus_id, devfun_id):
         """
diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py
index a6ac218..bc6ccca 100644
--- a/framework/project_dpdk.py
+++ b/framework/project_dpdk.py
@@ -202,7 +202,7 @@ class DPDKdut(Dut):
             # ToDo: make this configurable
             dst_dir = "/tmp/"
 
-            out = self.send_expect("ll %s && cd %s" % (dst_dir, p_dir),
+            out = self.send_expect("ls %s && cd %s" % (dst_dir, p_dir),
                                    "#", verify=True)
             if out == -1:
                 raise ValueError("Directiry %s or %s does not exist,"
-- 
1.9.3

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2015-03-09  8:22 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-27  7:09 [dts] [PATCH] bug fix: fix issue when DTS run on Fedora21 and freebsd Yong Liu
2015-02-28  3:22 ` Zhang, XiaonanX
2015-02-28  8:26   ` Zhang, XiaonanX
2015-02-28  8:37     ` Liu, Yong
2015-03-05  6:59       ` Liu, Yong
2015-03-09  2:37         ` Zhang, XiaonanX
2015-03-09  8:22           ` Liu, Yong
2015-03-02  4:50     ` Qiu, Michael

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).