diff options
| -rw-r--r-- | test-cli/.idea/workspace.xml | 8 | ||||
| -rw-r--r-- | test-cli/test/helpers/testsrv_db.py | 4 | ||||
| -rw-r--r-- | test-cli/test/tests/qnand.py | 2 | ||||
| -rw-r--r-- | test-cli/test/tests/qram.py | 2 | ||||
| -rw-r--r-- | test-cli/test_main.py | 4 |
5 files changed, 13 insertions, 7 deletions
diff --git a/test-cli/.idea/workspace.xml b/test-cli/.idea/workspace.xml index 6167250..9b9e803 100644 --- a/test-cli/.idea/workspace.xml +++ b/test-cli/.idea/workspace.xml @@ -1,7 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ChangeListManager"> - <list default="true" id="4991a6e0-1b9d-4824-9b6e-5ac031eb4816" name="Default Changelist" comment="" /> + <list default="true" id="4991a6e0-1b9d-4824-9b6e-5ac031eb4816" name="Default Changelist" comment=""> + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/test/helpers/testsrv_db.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/helpers/testsrv_db.py" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/test/tests/qnand.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/tests/qnand.py" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/test/tests/qram.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/tests/qram.py" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/test_main.py" beforeDir="false" afterPath="$PROJECT_DIR$/test_main.py" afterDir="false" /> + </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> diff --git a/test-cli/test/helpers/testsrv_db.py b/test-cli/test/helpers/testsrv_db.py index c9372fc..a6a5545 100644 --- a/test-cli/test/helpers/testsrv_db.py +++ b/test-cli/test/helpers/testsrv_db.py @@ -137,8 +137,8 @@ class TestSrv_Database(object): # print(r) return None - def create_task_result(self, taskid_ctl, name, newstatus): - sql = "SELECT isee.f_create_task_result({},'{}','{}')".format(taskid_ctl, name, newstatus) + def create_task_result(self, taskid_ctl, name, newstatus, info=None): + sql = "SELECT isee.f_create_task_result({},'{}','{}','{}')".format(taskid_ctl, name, newstatus, info) # print('>>>' + sql) try: self.__sqlObject.db_execute_query(sql) diff --git a/test-cli/test/tests/qnand.py b/test-cli/test/tests/qnand.py index 5125c1c..10a68f2 100644 --- a/test-cli/test/tests/qnand.py +++ b/test-cli/test/tests/qnand.py @@ -18,6 +18,6 @@ class Qnand(unittest.TestCase): def execute(self): try: - sh.nandtest("-m", self.__device) + sh.nandtest("-m", self.__device, _out="/dev/null") except sh.ErrorReturnCode as e: self.fail("failed: could not complete nandtest command") diff --git a/test-cli/test/tests/qram.py b/test-cli/test/tests/qram.py index cc75b68..5a7734a 100644 --- a/test-cli/test/tests/qram.py +++ b/test-cli/test/tests/qram.py @@ -23,6 +23,6 @@ class Qram(unittest.TestCase): def execute(self): try: - sh.memtester(self.__memsize, "1") + sh.memtester(self.__memsize, "1", _out="/dev/null") except sh.ErrorReturnCode as e: self.fail("failed: could not complete memtester command") diff --git a/test-cli/test_main.py b/test-cli/test_main.py index 6681d4e..43a5b67 100644 --- a/test-cli/test_main.py +++ b/test-cli/test_main.py @@ -145,7 +145,7 @@ def main(): mac0 = psdbObj.get_board_macaddr(globalVar.g_uuid) resulteeprom = flash_eeprom(varlist["eeprompath"], globalVar.g_uuid, mac0) psdbObj.create_task_result(globalVar.taskid_ctl, "FLASHEEPROM", - "TASK_OK" if resulteeprom == 0 else "TASK_FAIL") + "TASK_OK" if resulteeprom == 0 else "TASK_FAIL", varlist["eeprompath"]) else: resulteeprom = 0 psdbObj.create_task_result(globalVar.taskid_ctl, "FLASHEEPROM", "TASK_SKIP") @@ -154,7 +154,7 @@ def main(): if "image" in varlist and len(varlist["image"]) > 0: resultmemory = flash_memory(varlist["image"]) psdbObj.create_task_result(globalVar.taskid_ctl, "FLASHMEMORY", - "TASK_OK" if resultmemory == 0 else "TASK_FAIL") + "TASK_OK" if resultmemory == 0 else "TASK_FAIL", varlist["image"]) else: resultmemory = 0 psdbObj.create_task_result(globalVar.taskid_ctl, "FLASHMEMORY", "TASK_SKIP") |