summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManel Caro <mcaro@iatec.biz>2020-10-02 14:10:48 +0200
committerManel Caro <mcaro@iatec.biz>2020-10-02 14:10:48 +0200
commitce7885cf9cb5b4e232ac8659eaaf82591d14eaa9 (patch)
treedb570e764695e49728064c7ce321f2970d520467
parentacc0bfecb73a2ef47620aabb8234f507aed69085 (diff)
downloadboard-ce7885cf9cb5b4e232ac8659eaaf82591d14eaa9.zip
board-ce7885cf9cb5b4e232ac8659eaaf82591d14eaa9.tar.gz
board-ce7885cf9cb5b4e232ac8659eaaf82591d14eaa9.tar.bz2
fix database connection message
-rw-r--r--.idea/sshConfigs.xml8
-rw-r--r--.idea/webServers.xml14
-rw-r--r--test-cli/test_main.py4
3 files changed, 24 insertions, 2 deletions
diff --git a/.idea/sshConfigs.xml b/.idea/sshConfigs.xml
new file mode 100644
index 0000000..786082f
--- /dev/null
+++ b/.idea/sshConfigs.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="SshConfigs">
+ <configs>
+ <sshConfig authType="PASSWORD" host="192.168.70.103" id="472af0db-b796-4ceb-b3b2-0756d856cbf6" port="22" nameFormat="DESCRIPTIVE" username="root" />
+ </configs>
+ </component>
+</project> \ No newline at end of file
diff --git a/.idea/webServers.xml b/.idea/webServers.xml
new file mode 100644
index 0000000..691eda2
--- /dev/null
+++ b/.idea/webServers.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="WebServers">
+ <option name="servers">
+ <webServer id="9c70e797-df67-4684-951a-436bc6a0c92b" name="station03">
+ <fileTransfer rootFolder="/root/hwtest-files/board" accessType="SFTP" host="192.168.70.103" port="22" sshConfigId="472af0db-b796-4ceb-b3b2-0756d856cbf6" sshConfig="root@192.168.70.103:22 password">
+ <advancedOptions>
+ <advancedOptions dataProtectionLevel="Private" passiveMode="true" shareSSLContext="true" />
+ </advancedOptions>
+ </fileTransfer>
+ </webServer>
+ </option>
+ </component>
+</project> \ No newline at end of file
diff --git a/test-cli/test_main.py b/test-cli/test_main.py
index ebaf0d9..7bf0c34 100644
--- a/test-cli/test_main.py
+++ b/test-cli/test_main.py
@@ -37,7 +37,6 @@ from test.helpers.qrreader import QRReader
from test.helpers.cmdline import LinuxKernelCmd
from test.helpers.amper import Amper
from test.enums.StationStates import StationStates
-from test.helpers.mydebugger import sentdebugmessage
import xml.etree.ElementTree as XMLParser
from test.helpers.iseelogger import logObj
from test.helpers.utils import str2bool
@@ -403,7 +402,7 @@ if __name__ == "__main__":
# Error
execute_station_error("Cannot open DB connection")
else:
- logObj.getlogger().debug("database connection failed: {}".format(psdbObj.getConfig()))
+ logObj.getlogger().debug("database connection ok: {}".format(psdbObj.getConfig()))
# get station name
globalVar.station = socket.gethostname()
@@ -419,6 +418,7 @@ if __name__ == "__main__":
# Check if current state is "WAIT_TEST_START". if not, waits here
+ # if xmlObj.getKeyVal("test_main", "overrideCheckWaitStart", "0") == "1":
check_first_state()
# Change state to "TESTS_CHECKING_ENV"