From db3b1e45c47a1ef23c1ad67114a09cbec0976681 Mon Sep 17 00:00:00 2001
From: Hector Fernandez <hector@iatec.biz>
Date: Thu, 25 Jun 2020 11:45:31 +0200
Subject: Solved bugs. Adapted to DB changes.

---
 test-cli/test/tests/qamper.py | 64 +++++++++++++++++++++++++++++++------------
 1 file changed, 47 insertions(+), 17 deletions(-)

(limited to 'test-cli/test/tests/qamper.py')

diff --git a/test-cli/test/tests/qamper.py b/test-cli/test/tests/qamper.py
index 51aa469..7a31615 100644
--- a/test-cli/test/tests/qamper.py
+++ b/test-cli/test/tests/qamper.py
@@ -4,7 +4,7 @@ from test.helpers.amper import Amper
 
 class Qamper(unittest.TestCase):
     params = None
-    __current = None
+    __resultlist = None  # resultlist is a python list of python dictionaries
 
     # varlist: undercurrent, overcurrent
     def __init__(self, testname, testfunc, varlist):
@@ -20,36 +20,66 @@ class Qamper(unittest.TestCase):
         else:
             raise Exception('overcurrent param inside Qamp must be defined')
         self._testMethodDoc = testname
+        self.__resultlist = []
 
     def execute(self):
         amp = Amper()
         # open serial connection
         if not amp.open():
-            self.fail("failed: can not open serial port")
-            return
+            self.__resultlist.append(
+                {
+                    "desc": "Test result",
+                    "data": "FAILED: can not open a serial port",
+                    "type": "string"
+                }
+            )
+            self.fail("Error: can not open a serial port")
         # check if the amperimeter is connected and working
         # 2 ATTEMTS
         if not amp.hello():
             if not amp.hello():
-                self.fail("failed: can not communicate")
-                return
+                self.__resultlist.append(
+                    {
+                        "desc": "Test result",
+                        "data": "FAILED: can not communicate with the amperimeter",
+                        "type": "string"
+                    }
+                )
+                self.fail("Error: can not communicate")
         # get current value (in Amperes)
-        self.__current = amp.getCurrent()
+        current = amp.getCurrent()
         # close serial connection
         amp.close()
         # Check current range
-        if float(self.__current) > float(self._overcurrent):
-            self.fail("failed: Overcurrent detected ( {} )".format(self.__current))
-        if float(self.__current) < float(self._undercurrent):
-            self.fail("failed: Undercurrent detected ( {} )".format(self.__current))
+        if float(current) > float(self._overcurrent):
+            # Overcurrent detected
+            self.__resultlist.append(
+                {
+                    "desc": "Test result",
+                    "data": "FAILED: Overcurrent detected ( {} A)".format(current),
+                    "type": "string"
+                }
+            )
+            self.fail("failed: Overcurrent detected ( {} )".format(current))
+        elif float(current) < float(self._undercurrent):
+            # Undercurrent detected
+            self.__resultlist.append(
+                {
+                    "desc": "Test result",
+                    "data": "FAILED: Undercurrent detected ( {} A)".format(current),
+                    "type": "string"
+                }
+            )
+            self.fail("failed: Undercurrent detected ( {} )".format(current))
 
-    def getresults(self):
-        # resultlist is a python list of python dictionaries
-        resultlist = [
+        # Test successful
+        self.__resultlist.append(
             {
-                "desc": "current (Ampers)",
-                "data": self.__current,
+                "desc": "Test result",
+                "data": "OK: Current {} A".format(current),
                 "type": "string"
             }
-        ]
-        return resultlist
+        )
+
+    def getresults(self):
+        return self.__resultlist
-- 
cgit v1.1