diff options
| author | Hector Fernandez <hector@iatec.biz> | 2020-03-19 16:33:53 +0100 |
|---|---|---|
| committer | Hector Fernandez <hector@iatec.biz> | 2020-03-19 21:31:03 +0100 |
| commit | 686893803c05fedd38a24bb1f661f8aeb7c652fe (patch) | |
| tree | 3f60b19c678b7c10a3c991db8feacb092e868207 /test-cli/test | |
| parent | f013d0a76976a52fce979036df404826dcbf385b (diff) | |
| download | board-686893803c05fedd38a24bb1f661f8aeb7c652fe.zip board-686893803c05fedd38a24bb1f661f8aeb7c652fe.tar.gz board-686893803c05fedd38a24bb1f661f8aeb7c652fe.tar.bz2 | |
Fixed problem generating dataepprom string.
Diffstat (limited to 'test-cli/test')
| -rw-r--r-- | test-cli/test/flashers/flasheeprom.py | 12 | ||||
| -rw-r--r-- | test-cli/test/helpers/testsrv_db.py | 4 |
2 files changed, 8 insertions, 8 deletions
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) |