Solved bugs. Adapted to DB changes.

1 files changed, 64 insertions, 12 deletions

diff --git a/test-cli/test/tests/qwifi.py b/test-cli/test/tests/qwifi.py
index a5b66e9..6f972d3 100644
--- a/test-cli/test/tests/qwifi.py
+++ b/test-cli/test/tests/qwifi.py
@@ -11,6 +11,7 @@ class Qwifi(unittest.TestCase):
     __port = None
     params = None
     __bwreal = None
+    __resultlist = None  # resultlist is a python list of python dictionaries
 
     # varlist content: serverip, bwexpected, port
     def __init__(self, testname, testfunc, varlist):
@@ -30,6 +31,7 @@ class Qwifi(unittest.TestCase):
             raise Exception('port param inside Qwifi must be defined')
         self.__numbytestx = "10M"
         self._testMethodDoc = testname
+        self.__resultlist = []
 
     def execute(self):
         # check if the board is connected to the router by wifi
@@ -63,28 +65,78 @@ class Qwifi(unittest.TestCase):
                             # save result file
                             with open('/tmp/wifi-iperf.json', 'w') as outfile:
                                 json.dump(data, outfile, indent=4)
+                            self.__resultlist.append(
+                                {
+                                    "desc": "iperf3 output",
+                                    "data": "/tmp/wifi-iperf.json",
+                                    "type": "file"
+                                }
+                            )
 
                             # check if BW is in the expected range
-                            self.failUnless(self.__bwreal > float(self.__bwexpected) * 0.9,
-                                            "failed: speed is lower than spected. Speed(Mbits/s)" + str(self.__bwreal))
+                            if self.__bwreal < float(self.__bwexpected):
+                                self.__resultlist.append(
+                                    {
+                                        "desc": "Test result",
+                                        "data": "FAILED: speed is lower than expected. Speed(Mbits/s): " + str(self.__bwreal),
+                                        "type": "string"
+                                    }
+                                )
+                                self.fail("failed: speed is lower than expected. Speed(Mbits/s): " + str(self.__bwreal))
                         else:
-                            self.fail("failed: could not complete iperf command")
+                            self.__resultlist.append(
+                                {
+                                    "desc": "Test result",
+                                    "data": "FAILED: could not complete iperf3 command",
+                                    "type": "string"
+                                }
+                            )
+                            self.fail("failed: could not complete iperf3 command")
                     else:
+                        self.__resultlist.append(
+                            {
+                                "desc": "Test result",
+                                "data": "FAILED: wlan0 interface doesn't have any ip address",
+                                "type": "string"
+                            }
+                        )
                         self.fail("failed: wlan0 interface doesn't have any ip address.")
                 else:
+                    self.__resultlist.append(
+                        {
+                            "desc": "Test result",
+                            "data": "FAILED: could not complete ifconfig command",
+                            "type": "string"
+                        }
+                    )
                     self.fail("failed: could not complete ifconfig command.")
             else:
+                self.__resultlist.append(
+                    {
+                        "desc": "Test result",
+                        "data": "FAILED: wifi module is not connected to the router",
+                        "type": "string"
+                    }
+                )
                 self.fail("failed: wifi module is not connected to the router.")
         else:
-            self.fail("failed: couldn't execute iw command")
+            self.__resultlist.append(
+                {
+                    "desc": "Test result",
+                    "data": "FAILED: could not execute iw command",
+                    "type": "string"
+                }
+            )
+            self.fail("failed: could not execute iw command")
 
-    def getresults(self):
-        # resultlist is a python list of python dictionaries
-        resultlist = [
+        # Test successful
+        self.__resultlist.append(
             {
-                "desc": "iperf3 output",
-                "data": "/tmp/wifi-iperf.json",
-                "type": "file"
+                "desc": "Test result",
+                "data": "OK",
+                "type": "string"
             }
-        ]
-        return resultlist
+        )
+
+    def getresults(self):
+        return self.__resultlist