[dts] [PATCH]framwork: add new parameter for kill_all

[dts] [PATCH]framwork: add new parameter for kill_all

[Lijuan Tu]

in some case ,we will choose session or alt_session to run kill-cmds

Signed-off-by: Lijuan Tu <lijuanx.a.tu@intel.com>
---
 framework/crb.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/framework/crb.py b/framework/crb.py
index fcbd7d9..afa4e63 100644
--- a/framework/crb.py
+++ b/framework/crb.py
@@ -337,14 +337,14 @@ class Crb(object):
             f.write(contents)
         self.session.copy_file_to(fileName)
 
-    def kill_all(self):
+    def kill_all(self, alt_session=True):
         """
         Kill all dpdk applications on CRB.
         """
         pids = []
         pid_reg = r'p(\d+)'
         cmd = 'lsof -Fp /var/run/.rte_config'
-        out = self.alt_session.session.send_expect(cmd, "# ", 10)
+        out = self.send_expect(cmd, "# ", 20, alt_session)
         if len(out):
             lines = out.split('\r\n')
             for line in lines:
@@ -352,11 +352,11 @@ class Crb(object):
                 if m:
                     pids.append(m.group(1))
         for pid in pids:
-            self.alt_session.session.send_expect('kill -9 %s' % pid, '# ')
+            self.send_expect('kill -9 %s' % pid, '# ', 20, alt_session)
             self.get_session_output(timeout=2)
 
         cmd = 'lsof -Fp /var/run/.rte_hugepage_info'
-        out = self.alt_session.session.send_expect(cmd, "# ", 10)
+        out = self.send_expect(cmd, "# ", 20, alt_session)
         if len(out) and "No such file or directory" not in out:
             self.logger.warning("There are some dpdk process not free hugepage")
             self.logger.warning("**************************************")
-- 
1.8.4.2

Re: [dts] [PATCH]framwork: add new parameter for kill_all

[Liu, Yong]

Thanks, applied.

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Lijuan Tu
> Sent: Friday, November 27, 2015 2:57 PM
> To: dts@dpdk.org
> Subject: [dts] [PATCH]framwork: add new parameter for kill_all
> 
> in some case ,we will choose session or alt_session to run kill-cmds
> 
> Signed-off-by: Lijuan Tu <lijuanx.a.tu@intel.com>
> ---
>  framework/crb.py | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/framework/crb.py b/framework/crb.py
> index fcbd7d9..afa4e63 100644
> --- a/framework/crb.py
> +++ b/framework/crb.py
> @@ -337,14 +337,14 @@ class Crb(object):
>              f.write(contents)
>          self.session.copy_file_to(fileName)
> 
> -    def kill_all(self):
> +    def kill_all(self, alt_session=True):
>          """
>          Kill all dpdk applications on CRB.
>          """
>          pids = []
>          pid_reg = r'p(\d+)'
>          cmd = 'lsof -Fp /var/run/.rte_config'
> -        out = self.alt_session.session.send_expect(cmd, "# ", 10)
> +        out = self.send_expect(cmd, "# ", 20, alt_session)
>          if len(out):
>              lines = out.split('\r\n')
>              for line in lines:
> @@ -352,11 +352,11 @@ class Crb(object):
>                  if m:
>                      pids.append(m.group(1))
>          for pid in pids:
> -            self.alt_session.session.send_expect('kill -9 %s' % pid, '# ')
> +            self.send_expect('kill -9 %s' % pid, '# ', 20, alt_session)
>              self.get_session_output(timeout=2)
> 
>          cmd = 'lsof -Fp /var/run/.rte_hugepage_info'
> -        out = self.alt_session.session.send_expect(cmd, "# ", 10)
> +        out = self.send_expect(cmd, "# ", 20, alt_session)
>          if len(out) and "No such file or directory" not in out:
>              self.logger.warning("There are some dpdk process not free
> hugepage")
>              self.logger.warning("**************************************")
> --
> 1.8.4.2