[PATCH v2 4/7] Netperf: check errors before the measured results

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

There's no point in doing a comparison against threshold if the netperf
command returned errors. Moving this check before the threshold
comparison. I also added returns to the individual threshold comparison
branches where it's not necessary to continue in the function execution.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 test_modules/Netperf.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/test_modules/Netperf.py b/test_modules/Netperf.py
index 5a9ffe7..d09bdfc 100644
--- a/test_modules/Netperf.py
+++ b/test_modules/Netperf.py
@@ -474,6 +474,17 @@ class Netperf(TestGeneric):
         rate_pretty = self._pretty_rate(rate)
         rate_dev_pretty = self._pretty_rate(rate_deviation,
unit=rate_pretty["unit"])
 
+        if rv != 0 and self._runs == 1:
+            res_data["msg"] = "Could not get performance
throughput!"
+            logging.info(res_data["msg"])
+            return (False, res_data)
+        elif rv != 0 and self._runs > 1:
+            res_data["msg"] = "At least one of the Netperf runs failed,
"\
+                              "check the logs and result data for more "\
+                              "information."
+            logging.info(res_data["msg"])
+            return (False, res_data)
+
         res_val = False
         if self._max_deviation is not None:
             if self._max_deviation["type"] == "percent":
@@ -517,6 +528,7 @@ class Netperf(TestGeneric):
                                    threshold_pretty["rate"],
                                    threshold_dev_pretty["rate"],
                                    threshold_pretty["unit"])
+                return (res_val, res_data)
             else:
                 res_val = True
                 res_data["msg"] = "Measured rate %.2f +-%.2f %s is higher
"\
@@ -527,6 +539,7 @@ class Netperf(TestGeneric):
                                    threshold_pretty["rate"],
                                    threshold_dev_pretty["rate"],
                                    threshold_pretty["unit"])
+                return (res_val, res_data)
         else:
             if rate > 0.0:
                 res_val = True
@@ -536,17 +549,6 @@ class Netperf(TestGeneric):
                                                 (rate_pretty["rate"],
                                                  rate_dev_pretty["rate"],
                                                  rate_pretty["unit"])
-
-        if rv != 0 and self._runs == 1:
-            res_data["msg"] = "Could not get performance
throughput!"
-            logging.info(res_data["msg"])
-            return (False, res_data)
-        elif rv != 0 and self._runs > 1:
-            res_data["msg"] = "At least one of the Netperf runs failed,
"\
-                              "check the logs and result data for more "\
-                              "information."
-            logging.info(res_data["msg"])
-            return (False, res_data)
         return (res_val, res_data)
 
     def run(self):
-- 
2.9.0