[harness-thci] remove pylint issues from THCI file (#6136)

This commit is contained in:
Eduardo Montoya
2021-02-04 13:51:59 -08:00
committed by GitHub
parent 0d41c4392a
commit 1d03d71a20
+14 -25
View File
@@ -148,14 +148,12 @@ class OpenThreadTHCI(object):
"""
Connect to the device.
"""
pass
@abstractmethod
def _disconnect(self):
"""
Disconnect from the device
"""
pass
@abstractmethod
def _cliReadLine(self):
@@ -164,7 +162,6 @@ class OpenThreadTHCI(object):
Returns:
None if no data
"""
pass
@abstractmethod
def _cliWriteLine(self, line):
@@ -173,17 +170,14 @@ class OpenThreadTHCI(object):
Args:
line str: data send to device
"""
pass
@abstractmethod
def _onCommissionStart(self):
"""Called when commissioning starts."""
pass
@abstractmethod
def _onCommissionStop(self):
"""Called when commissioning stops."""
pass
def __sendCommand(self, cmd, expectEcho=True):
self.log("command: %s", cmd)
@@ -436,9 +430,7 @@ class OpenThreadTHCI(object):
print('call setAddressFilterMode() ' + mode)
try:
cmd = 'macfilter addr ' + mode
if self.__executeCommand(cmd)[-1] == 'Done':
return True
return False
return self.__executeCommand(cmd)[-1] == 'Done'
except Exception as e:
ModuleHelper.WriteIntoDebugLogger('__setAddressFilterMode() Error: ' + str(e))
@@ -575,6 +567,7 @@ class OpenThreadTHCI(object):
strIp6Prefix = prefix[:19]
return strIp6Prefix + '::'
# pylint: disable=no-self-use
def __convertLongToHex(self, iValue, fillZeros=None):
"""convert a long hex integer to string
remove '0x' and 'L' return string
@@ -640,6 +633,7 @@ class OpenThreadTHCI(object):
self.logThreadStatus = self.logStatus['stop']
return logs
# pylint: disable=no-self-use
def __convertChannelMask(self, channelsArray):
"""convert channelsArray to bitmask format
@@ -705,6 +699,7 @@ class OpenThreadTHCI(object):
print('%s call getCommissionerSessionId' % self)
return self.__executeCommand('commissioner sessionid')[0]
# pylint: disable=no-self-use
def __escapeEscapable(self, string):
"""Escape CLI escapable characters in the given string.
@@ -737,7 +732,7 @@ class OpenThreadTHCI(object):
cmd = 'networkname %s' % networkName
datasetCmd = 'dataset networkname %s' % networkName
self.hasActiveDatasetToCommit = True
return (self.__executeCommand(cmd)[-1] == 'Done' and self.__executeCommand(datasetCmd)[-1] == 'Done')
return self.__executeCommand(cmd)[-1] == 'Done' and self.__executeCommand(datasetCmd)[-1] == 'Done'
except Exception as e:
ModuleHelper.WriteIntoDebugLogger('setNetworkName() Error: ' + str(e))
@@ -761,7 +756,7 @@ class OpenThreadTHCI(object):
cmd = 'channel %s' % channel
datasetCmd = 'dataset channel %s' % channel
self.hasActiveDatasetToCommit = True
return (self.__executeCommand(cmd)[-1] == 'Done' and self.__executeCommand(datasetCmd)[-1] == 'Done')
return self.__executeCommand(cmd)[-1] == 'Done' and self.__executeCommand(datasetCmd)[-1] == 'Done'
except Exception as e:
ModuleHelper.WriteIntoDebugLogger('setChannel() Error: ' + str(e))
@@ -907,7 +902,7 @@ class OpenThreadTHCI(object):
self.networkKey = masterKey
self.hasActiveDatasetToCommit = True
return (self.__executeCommand(cmd)[-1] == 'Done' and self.__executeCommand(datasetCmd)[-1] == 'Done')
return self.__executeCommand(cmd)[-1] == 'Done' and self.__executeCommand(datasetCmd)[-1] == 'Done'
except Exception as e:
ModuleHelper.WriteIntoDebugLogger('setNetworkkey() Error: ' + str(e))
@@ -1266,7 +1261,7 @@ class OpenThreadTHCI(object):
cmd = 'panid %s' % panid
datasetCmd = 'dataset panid %s' % panid
self.hasActiveDatasetToCommit = True
return (self.__executeCommand(cmd)[-1] == 'Done' and self.__executeCommand(datasetCmd)[-1] == 'Done')
return self.__executeCommand(cmd)[-1] == 'Done' and self.__executeCommand(datasetCmd)[-1] == 'Done'
except Exception as e:
ModuleHelper.WriteIntoDebugLogger('setPANID() Error: ' + str(e))
@@ -1880,7 +1875,7 @@ class OpenThreadTHCI(object):
self.xpanId = xpanid
self.hasActiveDatasetToCommit = True
return (self.__executeCommand(cmd)[-1] == 'Done' and self.__executeCommand(datasetCmd)[-1] == 'Done')
return self.__executeCommand(cmd)[-1] == 'Done' and self.__executeCommand(datasetCmd)[-1] == 'Done'
except Exception as e:
ModuleHelper.WriteIntoDebugLogger('setXpanId() Error: ' + str(e))
@@ -2045,7 +2040,7 @@ class OpenThreadTHCI(object):
if not listTLV_ids:
return
if not len(listTLV_ids):
if len(listTLV_ids) == 0:
return
cmd = 'networkdiagnostic get %s %s' % (
@@ -2061,7 +2056,7 @@ class OpenThreadTHCI(object):
if not listTLV_ids:
return
if not len(listTLV_ids):
if len(listTLV_ids) == 0:
return
cmd = 'networkdiagnostic reset %s %s' % (
@@ -2085,10 +2080,7 @@ class OpenThreadTHCI(object):
self.__executeCommand('ifconfig up')
cmd = 'joiner start %s' % (strPSKc)
print(cmd)
if self.__executeCommand(cmd)[-1] == 'Done':
return True
else:
return False
return self.__executeCommand(cmd)[-1] == 'Done'
@API
def startCollapsedCommissioner(self):
@@ -2835,10 +2827,7 @@ class OpenThreadTHCI(object):
@API
def ValidateDeviceFirmware(self):
print('%s call ValidateDeviceFirmware' % self)
if 'OPENTHREAD' in self.UIStatusMsg:
return True
else:
return False
return 'OPENTHREAD' in self.UIStatusMsge
# Low power THCI
@API
@@ -3071,7 +3060,7 @@ class OpenThread(OpenThreadTHCI, IThci):
return self.__lines.pop(0)
tail = ''
if len(self.__lines):
if len(self.__lines) != 0:
tail = self.__lines.pop()
try: