Skip to content

bpo-30987 - Support for ISO-TP protocol in SocketCAN #2956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tiran merged 13 commits into from
Aug 28, 2017
Merged

bpo-30987 - Support for ISO-TP protocol in SocketCAN #2956

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4d609c0
Added support for CAN_ISOTP protocol
pylessard Jul 26, 2017
ccd65b8
Added unit tests for CAN ISOTP
pylessard Jul 31, 2017
0017156
Updated documentation for ISO-TP protocol
pylessard Jul 31, 2017
85a1545
Removed trailing whitespace in documentation
pylessard Jul 31, 2017
32399d4
Added blurb NEWS.d file
pylessard Jul 31, 2017
fc058f8
updated Misc/ACKS
pylessard Jul 31, 2017
2aa760d
Fixed broken unit test that was using isotp const outside of skippabl…
pylessard Jul 31, 2017
fba09e6
Removed dependecy over third party project
pylessard Aug 3, 2017
17c58d7
Added implementation for getsockname + unit tests
pylessard Aug 3, 2017
7da8fed
Missing newline at end of ACKS file
pylessard Aug 3, 2017
1365fca
Accidentally inserted a type in ACKS file
pylessard Aug 4, 2017
280141c
Followed tiran changes review #1 recommendations
pylessard Aug 26, 2017
e2cc6f3
Added spaces after comma
pylessard Aug 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed broken unit test that was using isotp const outside of skippabl… 
…e section
  • Loading branch information
@pylessard
pylessard committed Jul 31, 2017
commit 2aa760dfc9aa1c7f0ff242b2619cdae714d29184
35 changes: 15 additions & 20 deletions Lib/test/test_socket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,7 @@ class ThreadableISOTPTest(unittest.TestCase, ThreadableTest):
def __init__(self, *args, **kwargs):
unittest.TestCase.__init__(self,*args, **kwargs)
ThreadableTest.__init__(self)
self.test_opts = {}
(self.cli_addr, self.srv_addr) = ThreadableISOTPTest.getAddressPair()

@classmethod
Expand All @@ -392,6 +393,7 @@ def getAddressPair(cls):

def clientSetUp(self):
try:
self.opts = self.test_opts[self._testMethodName] if self._testMethodName in self.test_opts else {}
self.cli = socket.socket(socket.PF_CAN, socket.SOCK_DGRAM, socket.CAN_ISOTP)
if 'cli' in self.opts:
for opt_const in self.opts['cli']:
Expand Down Expand Up @@ -1860,28 +1862,25 @@ def testSetLLOpts(self):


@unittest.skipUnless(HAVE_SOCKET_CAN_ISOTP, 'CAN ISOTP required for this test.')
@unittest.skipUnless(hasattr(socket, "SOL_CAN_ISOTP"),
'socket.SOL_CAN_ISOTP is required for this test')
@unittest.skipUnless(hasattr(socket, "CAN_ISOTP_RECV_FC"),
'socket.CAN_ISOTP_RECV_FC is required for this test')
class ISOTPTest(ThreadableISOTPTest):

test_opts = {
'testTiming' : {
def __init__(self, methodName='runTest', *args, **kwargs):
ThreadableISOTPTest.__init__(self,methodName, *args, **kwargs)

def setUp(self, *args, **kwargs):
self.test_opts['testTiming'] = {
'cli' : {
socket.CAN_ISOTP_RECV_FC : struct.pack("=BBB",10, 0x7F, 10) # bs, stmin, wftmax
},
'serv' : {

}
'serv' : {}
}
}

def __init__(self, methodName='runTest', *args, **kwargs):
ThreadableISOTPTest.__init__(self,methodName, *args, **kwargs)
if methodName in ISOTPTest.test_opts:
self.opts = ISOTPTest.test_opts[methodName]
else:
self.opts = {}

def setUp(self, *args, **kwargs):
self.serv = socket.socket(socket.PF_CAN, socket.SOCK_DGRAM, socket.CAN_ISOTP)
self.opts = self.test_opts[self._testMethodName] if self._testMethodName in self.test_opts else {}
try:
if 'serv' in self.opts:
for opt_const in self.opts['serv']:
Expand Down Expand Up @@ -1910,14 +1909,10 @@ def testFullFrame(self):
self.assertEqual(bindata, self.bindata)

def _testTiming(self):
self.bindata2 = self.makeRandomData(150)
self.bindata2 = self.makeRandomData(512)
self.tic = time.time()
self.cli.send(self.bindata2)

@unittest.skipUnless(hasattr(socket, "SOL_CAN_ISOTP"),
'socket.SOL_CAN_ISOTP is required for this test')
@unittest.skipUnless(hasattr(socket, "CAN_ISOTP_RECV_FC"),
'socket.CAN_ISOTP_RECV_FC is required for this test')
def testTiming(self):
"""
The main goal of this test is to validate that the driver correctly receive options via setsockopt.
Expand All @@ -1929,7 +1924,7 @@ def testTiming(self):
self.assertEqual(bindata2, self.bindata2)
measured_time = math.ceil(self.toc-self.tic)
min_time = math.floor(self.calcFrameCnt(len(self.bindata2))*0.127)
self.assertGreater(measured_time, min_time)
self.assertGreaterEqual(measured_time, min_time)

def calcFrameCnt(self, size):
if size < 1 or size > 4095:
Expand Down