From 9f07a57d89a927aa9b172c1bf20c7ab563658c73 Mon Sep 17 00:00:00 2001
From: Hector Fernandez <hector@iatec.biz>
Date: Fri, 6 Mar 2020 12:46:27 +0100
Subject: Fixed multiple errors.

---
 test-cli/test/helpers/testsrv_db.py | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'test-cli/test/helpers/testsrv_db.py')

diff --git a/test-cli/test/helpers/testsrv_db.py b/test-cli/test/helpers/testsrv_db.py
index b7b75b1..d937d3e 100644
--- a/test-cli/test/helpers/testsrv_db.py
+++ b/test-cli/test/helpers/testsrv_db.py
@@ -27,11 +27,13 @@ class TestSrv_Database(object):
     def create_board(self, processor_id, model_id, variant, station, bmac=None):
         '''create a new board'''
         if bmac is None:
-            sql = "SELECT isee.f_create_board('{}', '{}', '{}', NULL, '{}');".format(processor_id, model_id, variant,
-                                                                                     station)
+            sql = "SELECT * FROM isee.f_create_board('{}', '{}', '{}', NULL, '{}');".format(processor_id, model_id,
+                                                                                            variant,
+                                                                                            station)
         else:
-            sql = "SELECT isee.f_create_board('{}', '{}', '{}', '{}', '{}');".format(processor_id, model_id, variant,
-                                                                                     bmac, station)
+            sql = "SELECT * FROM isee.f_create_board('{}', '{}', '{}', '{}', '{}');".format(processor_id, model_id,
+                                                                                            variant,
+                                                                                            bmac, station)
         # print('>>>' + sql)
         try:
             res = self.__sqlObject.db_execute_query(sql)
@@ -57,7 +59,7 @@ class TestSrv_Database(object):
 
     def get_test_params_list(self, testid):
         '''get the board test list'''
-        sql = "SELECT * FROM isee.f_get_test_params_list('{}')".format(testid)
+        sql = "SELECT * FROM isee.f_get_test_params_list({})".format(testid)
         # print('>>>' + sql)
         try:
             res = self.__sqlObject.db_execute_query(sql)
@@ -75,7 +77,7 @@ class TestSrv_Database(object):
         try:
             res = self.__sqlObject.db_execute_query(sql)
             # print(res)
-            return res
+            return res[0][0]
         except Exception as err:
             r = find_between(str(err), '#', '#')
             # print(r)
@@ -83,12 +85,10 @@ class TestSrv_Database(object):
 
     def run_test(self, testid_ctl, testid):
         '''get the board test list'''
-        sql = "SELECT * FROM isee.f_run_test('{}','{}')".format(testid_ctl, testid)
+        sql = "SELECT isee.f_run_test({},{})".format(testid_ctl, testid)
         # print('>>>' + sql)
         try:
-            res = self.__sqlObject.db_execute_query(sql)
-            # print(res)
-            return res
+            self.__sqlObject.db_execute_query(sql)
         except Exception as err:
             r = find_between(str(err), '#', '#')
             # print(r)
@@ -96,12 +96,10 @@ class TestSrv_Database(object):
 
     def finish_test(self, testid_ctl, testid, newstatus):
         '''get the board test list'''
-        sql = "SELECT * FROM isee.f_finish_test('{}','{}','{}')".format(testid_ctl, testid, newstatus)
+        sql = "SELECT isee.f_finish_test({},{},'{}')".format(testid_ctl, testid, newstatus)
         # print('>>>' + sql)
         try:
-            res = self.__sqlObject.db_execute_query(sql)
-            # print(res)
-            return res
+            self.__sqlObject.db_execute_query(sql)
         except Exception as err:
             r = find_between(str(err), '#', '#')
             # print(r)
-- 
cgit v1.1