TEST restructure

1 files changed, 21 insertions, 4 deletions

diff --git a/test-cli/test/helpers/testsrv_db.py b/test-cli/test/helpers/testsrv_db.py
index 9579e7e..c2b2276 100644
--- a/test-cli/test/helpers/testsrv_db.py
+++ b/test-cli/test/helpers/testsrv_db.py
@@ -24,6 +24,9 @@ class TestSrv_Database(object):
         self.__sqlObject = PgSQLConnection()
         return self.__sqlObject.db_connect(self.__xml_setup.getdbConnectionStr())
 
+    def getConfig(self):
+        return self.__sqlObject.getConfig()
+
     def create_board(self, processor_id, model_id, variant, station, bmac=None):
         '''create a new board'''
         if bmac is None:
@@ -41,7 +44,8 @@ class TestSrv_Database(object):
             return res[0][0]
         except Exception as err:
             r = find_between(str(err), '#', '#')
-            # print(r)
+            print(r)
+            print(str(err))
         return None
 
     def get_tests_list(self, board_uuid):
@@ -95,10 +99,11 @@ class TestSrv_Database(object):
         sql = "SELECT isee.f_finish_test({},{},'{}','{}')".format(testid_ctl, testid, newstatus, textresult)
         # print('>>>' + sql)
         try:
+            print('finish_test => SQL {}'.format(sql))
             self.__sqlObject.db_execute_query(sql)
         except Exception as err:
             r = find_between(str(err), '#', '#')
-            # print(r)
+            print('finish_test => {}'.format(err))
         return None
 
     def upload_result_file(self, testid_ctl, testid, desc, filepath, mimetype):
@@ -195,6 +200,18 @@ class TestSrv_Database(object):
 
     def change_station_state(self, station, newstate):
         sql = "SELECT station.setmystate('{}', '{}', NULL)".format(newstate, station)
+        print('>>>' + sql)
+        try:
+            res = self.__sqlObject.db_execute_query(sql)
+            print(res)
+            return res[0][0]
+        except Exception as err:
+            r = find_between(str(err), '#', '#')
+            print(r)
+        return None
+
+    def get_setup_variable(self, skey):
+        sql = "SELECT * FROM admin.get_setupvar('{}')".format(skey)
         # print('>>>' + sql)
         try:
             res = self.__sqlObject.db_execute_query(sql)
@@ -205,7 +222,7 @@ class TestSrv_Database(object):
             # print(r)
         return None
 
-    def get_setup_variable(self, skey):
+    def get_setup_variable(self, skey , default):
         sql = "SELECT * FROM admin.get_setupvar('{}')".format(skey)
         # print('>>>' + sql)
         try:
@@ -215,4 +232,4 @@ class TestSrv_Database(object):
         except Exception as err:
             r = find_between(str(err), '#', '#')
             # print(r)
-        return None
+        return default