diff options
Diffstat (limited to 'test-cli')
| -rw-r--r-- | test-cli/.idea/workspace.xml | 14 | ||||
| -rw-r--r-- | test-cli/test/flashers/flasheeprom.py | 12 | ||||
| -rw-r--r-- | test-cli/test/helpers/testsrv_db.py | 4 |
3 files changed, 18 insertions, 12 deletions
diff --git a/test-cli/.idea/workspace.xml b/test-cli/.idea/workspace.xml index 2aa3d94..1136484 100644 --- a/test-cli/.idea/workspace.xml +++ b/test-cli/.idea/workspace.xml @@ -3,7 +3,8 @@ <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/helpers/testsrv_db.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/helpers/testsrv_db.py" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/test/flashers/flasheeprom.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/flashers/flasheeprom.py" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/test/flashers/flashmemory.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/flashers/flashmemory.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" /> @@ -33,7 +34,7 @@ <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="WebServerToolWindowFactoryState" value="false" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" /> - <property name="settings.editor.selected.configurable" value="Errors" /> + <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" /> </component> <component name="RecentsManager"> <key name="MoveFile.RECENT_KEYS"> @@ -152,10 +153,15 @@ <screen x="67" y="27" width="1853" height="1053" /> </state> <state width="1830" height="344" key="GridCell.Tab.1.right/67.27.1853.1053@67.27.1853.1053" timestamp="1583490132185" /> - <state x="482" y="187" key="SettingsEditor" timestamp="1583495091828"> - <screen x="67" y="27" width="1853" height="1053" /> + <state x="625" y="187" key="SettingsEditor" timestamp="1584629096697"> + <screen x="67" y="27" width="2493" height="1053" /> </state> <state x="482" y="187" key="SettingsEditor/67.27.1853.1053@67.27.1853.1053" timestamp="1583495091828" /> + <state x="625" y="187" key="SettingsEditor/67.27.2493.1053@67.27.2493.1053" timestamp="1584629096697" /> + <state x="949" y="380" key="com.intellij.ide.util.TipDialog" timestamp="1584629006518"> + <screen x="67" y="27" width="2493" height="1053" /> + </state> + <state x="949" y="380" key="com.intellij.ide.util.TipDialog/67.27.2493.1053@67.27.2493.1053" timestamp="1584629006518" /> <state x="543" y="240" width="890" height="624" key="com.intellij.xdebugger.impl.breakpoints.ui.BreakpointsDialogFactory$2" timestamp="1583753593705"> <screen x="67" y="27" width="1853" height="1053" /> </state> diff --git a/test-cli/test/flashers/flasheeprom.py b/test-cli/test/flashers/flasheeprom.py index bdeb7e6..fe1a4b2 100644 --- a/test-cli/test/flashers/flasheeprom.py +++ b/test-cli/test/flashers/flasheeprom.py @@ -20,12 +20,12 @@ def _generate_data_bytes(boarduuid, mac0, mac1): def _generate_output_data(data_rx): - boarduuid = data_rx[8:45].decode - mac0 = binascii.hexlify(data_rx[45:53]).decode() - mac1 = binascii.hexlify(data_rx[53:61]).decode() - smac0 = '-'.join(mac0[i:i + 2] for i in range(0, len(mac0), 2)) - smac1 = '-'.join(mac1[i:i + 2] for i in range(0, len(mac1), 2)) - eepromdata = "UUID :" + boarduuid + " MAC0:" + smac0 + " MAC1:" + smac1 + boarduuid = data_rx[8:45].decode() + mac0 = binascii.hexlify(data_rx[45:51]).decode() + mac1 = binascii.hexlify(data_rx[51:57]).decode() + smac0 = ':'.join(mac0[i:i + 2] for i in range(0, len(mac0), 2)) + smac1 = ':'.join(mac1[i:i + 2] for i in range(0, len(mac1), 2)) + eepromdata = "UUID:" + boarduuid + " MAC0:" + smac0 + " MAC1:" + smac1 return eepromdata diff --git a/test-cli/test/helpers/testsrv_db.py b/test-cli/test/helpers/testsrv_db.py index 27024ce..bf51acf 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, info=None): - sql = "SELECT isee.f_create_task_result({},'{}','{}','{}')".format(taskid_ctl, name, newstatus, info) + def create_task_result(self, taskid_ctl, name, newstatus, newinfo=None): + sql = "SELECT isee.f_create_task_result({},'{}','{}','{}')".format(taskid_ctl, name, newstatus, newinfo) # print('>>>' + sql) try: self.__sqlObject.db_execute_query(sql) |