[PATCH 1/3] Add is_installed method

[Jiri Prochazka]

This method is used for detecting if program is present in $PATH

Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com&gt;
---
 lnst/Common/Utils.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lnst/Common/Utils.py b/lnst/Common/Utils.py
index c283b99..d198b6f 100644
--- a/lnst/Common/Utils.py
+++ b/lnst/Common/Utils.py
@@ -263,3 +263,16 @@ def std_deviation(values):
         s1 += val
         s2 += val**2
     return (math.sqrt(len(values)*s2 - s1**2))/len(values)
+
+def is_installed(program):
+    """
+    Returns True if program is detected by which, False otherwise
+    """
+    cmd = "which %s" % program
+    process = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE,
+                               stderr=subprocess.PIPE)
+    output = process.communicate()[0]
+    if process.returncode == 0:
+        return True
+    else:
+        return False
-- 
2.4.3

[PATCH 2/3] Add is_installed check for Netperf

[Jiri Prochazka]

If netperf (on client side) or netserver (on server side) is present in recipe
and is not installed on slave, test will FAIL and logs relevant error message

Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com&gt;
---
 test_modules/Netperf.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/test_modules/Netperf.py b/test_modules/Netperf.py
index ab79646..23c36a7 100644
--- a/test_modules/Netperf.py
+++ b/test_modules/Netperf.py
@@ -11,7 +11,7 @@ import errno
 import re
 from lnst.Common.TestsCommon import TestGeneric
 from lnst.Common.ShellProcess import ShellProcess
-from lnst.Common.Utils import std_deviation
+from lnst.Common.Utils import std_deviation, is_installed
 
 class Netperf(TestGeneric):
 
@@ -318,9 +318,20 @@ class Netperf(TestGeneric):
         cmd = self._compose_cmd()
         logging.debug("compiled command: %s" % cmd)
         if self._role == "client":
+            if not is_installed("netperf"):
+                res_data = {}
+                res_data["msg"] = "Netperf is not installed on this
machine!"
+                logging.error(res_data["msg"])
+                return self.set_fail(res_data)
+
             (rv, res_data) = self._run_client(cmd)
             if rv == False:
                 return self.set_fail(res_data)
             return self.set_pass(res_data)
         elif self._role == "server":
+            if not is_installed("netserver"):
+                res_data = {}
+                res_data["msg"] = "Netserver is not installed on this
machine!"
+                logging.error(res_data["msg"])
+                return self.set_fail(res_data)
             self._run_server(cmd)
-- 
2.4.3

[PATCH 3/3] Add is_installed check to Iperf

[Jiri Prochazka]

If Iperf is present in recipe and is not installed on slave machine,
test will FAIL and logs relevant error message

Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com&gt;
---
 test_modules/Iperf.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test_modules/Iperf.py b/test_modules/Iperf.py
index 09cc6b4..77bd1a0 100644
--- a/test_modules/Iperf.py
+++ b/test_modules/Iperf.py
@@ -13,6 +13,7 @@ import re
 from lnst.Common.TestsCommon import TestGeneric
 from lnst.Common.ExecCmd import exec_cmd
 from lnst.Common.ShellProcess import ShellProcess
+from lnst.Common.Utils import is_installed
 
 class Iperf(TestGeneric):
     def _compose_iperf_cmd(self, role):
@@ -138,6 +139,11 @@ class Iperf(TestGeneric):
         role = self.get_mopt("role")
         cmd = self._compose_iperf_cmd(role)
         logging.debug("compiled command: %s" % cmd)
+        if not is_installed("iperf"):
+            res_data = {}
+            res_data["msg"] = "Iperf is not installed on this
machine!"
+            logging.error(res_data["msg"])
+            return self.set_fail(res_data)
 
         if role == "server":
             logging.debug("running as server ...")
-- 
2.4.3

[Jan Tluka]

Mon, Aug 24, 2015 at 01:49:41PM CEST, jprochaz(a)redhat.com wrote:
> This method is used for detecting if program is present in $PATH
>
> Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com&gt;
> ---
>  lnst/Common/Utils.py | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
>
> diff --git a/lnst/Common/Utils.py b/lnst/Common/Utils.py
> index c283b99..d198b6f 100644
> --- a/lnst/Common/Utils.py
> +++ b/lnst/Common/Utils.py
> @@ -263,3 +263,16 @@ def std_deviation(values):
>          s1 += val
>          s2 += val**2
>      return (math.sqrt(len(values)*s2 - s1**2))/len(values)
> +
> +def is_installed(program):
> +    """
> +    Returns True if program is detected by which, False otherwise
> +    """
> +    cmd = "which %s" % program
> +    process = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE,
> +                               stderr=subprocess.PIPE)
> +    output = process.communicate()[0] 
I think this is too complicated. Also you save output but it's never
used. Check if you can use simpler functions from the module as
.check_call() or .call().

> +    if process.returncode == 0:
> +        return True
> +    else:
> +        return False
> -- 
> 2.4.3
>
> _______________________________________________
> LNST-developers mailing list
> LNST-developers(a)lists.fedorahosted.org
> https://lists.fedorahosted.org/mailman/listinfo/lnst-developers

[Jiri Prochazka]

new patchset posted,
thanks for feedback

​Best regards,​

Jiri Prochazka
LNST Developer
​| www.lnst-project.org​

[phone] | jprochaz(a)redhat.com
Red Hat Czech | Purkyňova 71/99, 612 00 Brno

2015-08-25 11:56 GMT+02:00 Jan Tluka <jtluka(a)redhat.com&gt;:

>  Mon, Aug 24, 2015 at 01:49:41PM CEST, jprochaz(a)redhat.com wrote:
>  >This method is used for detecting if program is present in $PATH
>  >
>  >Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com&gt;
>  >---
>  > lnst/Common/Utils.py | 13 +++++++++++++
>  > 1 file changed, 13 insertions(+)
>  >
>  >diff --git a/lnst/Common/Utils.py b/lnst/Common/Utils.py
>  >index c283b99..d198b6f 100644
>  >--- a/lnst/Common/Utils.py
>  >+++ b/lnst/Common/Utils.py
>  >@@ -263,3 +263,16 @@ def std_deviation(values):
>  >         s1 += val
>  >         s2 += val**2
>  >     return (math.sqrt(len(values)*s2 - s1**2))/len(values)
>  >+
>  >+def is_installed(program):
>  >+    """
>  >+    Returns True if program is detected by which, False otherwise
>  >+    """
>  >+    cmd = "which %s" % program
>  >+    process = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE,
>  >+                               stderr=subprocess.PIPE)
>  >+    output = process.communicate()[0]
>
>  I think this is too complicated. Also you save output but it's never
>  used. Check if you can use simpler functions from the module as
>  .check_call() or .call().
>
>  >+    if process.returncode == 0:
>  >+        return True
>  >+    else:
>  >+        return False
>  >--
>  >2.4.3
>  >
>  >_______________________________________________
>  >LNST-developers mailing list
>  &gt;LNST-developers(a)lists.fedorahosted.org
>  >https://lists.fedorahosted.org/mailman/listinfo/lnst-developers
>