Index: dialin/squish/denaliMessages.py =================================================================== diff -u -rfef5a97d8f0bc350e36ceee6b8ee6619d4f8e8de -r27357f8b363431d4bbb9f15960b24c7036fdc76c --- dialin/squish/denaliMessages.py (.../denaliMessages.py) (revision fef5a97d8f0bc350e36ceee6b8ee6619d4f8e8de) +++ dialin/squish/denaliMessages.py (.../denaliMessages.py) (revision 27357f8b363431d4bbb9f15960b24c7036fdc76c) @@ -29,15 +29,11 @@ import time import subprocess -import names -if names.DIALIN_LINK: - from dialin.squish import utils - from dialin.squish import messageBuilder -else: - import utils - import messageBuilder +from dialin.squish import utils +from dialin.squish import messageBuilder + class EResponse: Rejected = 0 Accepted = 1 @@ -682,15 +678,15 @@ frames = buildUnknown() frames = messageBuilder.toCandumpFormat(frames) for frame in frames: - subprocess.call(['cansend', 'can0', '001#{}'.format(frame)]) # send from HD + subprocess.call(['cansend', 'can0', '001#{}'.format(frame)]) # send from HD waitForMessageToBeSent() def sendUnknown_DG(): frames = buildUnknown() frames = messageBuilder.toCandumpFormat(frames) for frame in frames: - subprocess.call(['cansend', 'can0', '070#{}'.format(frame)]) # send from DG + subprocess.call(['cansend', 'can0', '070#{}'.format(frame)]) # send from DG waitForMessageToBeSent() Index: dialin/squish/unittests.py =================================================================== diff -u -rc3cc81dada72714b9675594cc0c6a79975e8991d -r27357f8b363431d4bbb9f15960b24c7036fdc76c --- dialin/squish/unittests.py (.../unittests.py) (revision c3cc81dada72714b9675594cc0c6a79975e8991d) +++ dialin/squish/unittests.py (.../unittests.py) (revision 27357f8b363431d4bbb9f15960b24c7036fdc76c) @@ -27,6 +27,7 @@ # import test import sys +from subprocess import check_output from dialin.squish import crc MICRO = [8, 9] @@ -65,3 +66,15 @@ test.compare(crc.calcCRC8(strByte2, ' '), '55') test.compare(crc.calcCRC8(strByte3, ' '), '4F') test.compare(crc.calcCRC8(strByte4, ' '), '7F') + +def test_can0(): + canid = "can0" + ipa = "ip a" + ipa = check_output(ipa, shell=True) + loc = str(ipa).find(canid) + fnd = loc >= 0 + if (fnd): + msg = "can device '{}' found".format(canid) + else: + msg = "No can device registered as '{}'".format(canid) + test.compare(loc >= 0, True, msg)