summaryrefslogtreecommitdiff
path: root/test-cli
diff options
context:
space:
mode:
Diffstat (limited to 'test-cli')
-rw-r--r--test-cli/.idea/workspace.xml3
-rw-r--r--test-cli/test_main.py10
2 files changed, 3 insertions, 10 deletions
diff --git a/test-cli/.idea/workspace.xml b/test-cli/.idea/workspace.xml
index 31b0cdc..66fc90e 100644
--- a/test-cli/.idea/workspace.xml
+++ b/test-cli/.idea/workspace.xml
@@ -3,9 +3,6 @@
<component name="ChangeListManager">
<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/enums/StationStates.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/enums/StationStates.py" 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/qaudio.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/tests/qaudio.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" />
diff --git a/test-cli/test_main.py b/test-cli/test_main.py
index 3da79f7..80dfbe2 100644
--- a/test-cli/test_main.py
+++ b/test-cli/test_main.py
@@ -107,7 +107,8 @@ def reboot_if_autotest():
# reset board if AUTOTEST is enabled
autotest = psdbObj.get_setup_variable("AUTOTEST_" + globalVar.station)
if int(autotest) == 1:
- os.system('reboot')
+ os.system("reboot")
+ exit(0)
def create_paramslist(params):
@@ -291,12 +292,7 @@ def main():
qr.closeQR()
# Change state to "FINISHED"
- if psdbObj.read_station_state(globalVar.station) == StationStates.STATION_ERROR.name:
- # Abort
- print(
- "Error: Wrong previous station state before changing to FINISHED state. STATION_ERROR state unexpected.")
- exit(0)
- psdbObj.change_station_state(globalVar.station, StationStates.FINISHED.name)
+ set_next_state(StationStates.FINISHED.name)
else:
psdbObj.update_taskctl_status(globalVar.taskid_ctl, "TASK_BOARD_FAIL")
loggerObj.getlogger().info("Station error: #Unable to complete extra tasks#")