Skip to content

Fixed simplecyclic test #540

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
felixdivo merged 4 commits into from
Apr 4, 2019
Merged

Fixed simplecyclic test #540

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54497dd
Fixed simplecyclic test
bhass1 Apr 1, 2019
2eae49b
Merge branch 'develop' into 3.1.1-cyclic_test_fix
bhass1 Apr 1, 2019
a180cc3
Merge branch 'develop' into 3.1.1-cyclic_test_fix
felixdivo Apr 4, 2019
03c092b
Readded test to compare sent msg and recvd msg in simplecyclic
bhass1 Apr 4, 2019
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
17 changes: 14 additions & 3 deletions test/simplecyclic_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class SimpleCyclicSendTaskTest(unittest.TestCase, ComparingMessagesTestCase):

def __init__(self, *args, **kwargs):
unittest.TestCase.__init__(self, *args, **kwargs)
ComparingMessagesTestCase.__init__(self, allowed_timestamp_delta=None, preserves_channel=True)
ComparingMessagesTestCase.__init__(self, allowed_timestamp_delta=0.016, preserves_channel=True)

@unittest.skipIf(IS_CI, "the timing sensitive behaviour cannot be reproduced reliably on a CI server")
def test_cycle_time(self):
Expand All @@ -36,8 +36,19 @@ def test_cycle_time(self):
self.assertTrue(80 <= size <= 120,
'100 +/- 20 messages should have been transmitted. But queue contained {}'.format(size))
last_msg = bus2.recv()
self.assertMessageEqual(last_msg, msg)

next_last_msg = bus2.recv()
# Check consecutive messages are spaced properly in time and have
# the same id/data
self.assertMessageEqual(last_msg, next_last_msg)


# Check the message id/data sent is the same as message received
# Set timestamp and channel to match recv'd because we don't care
# and they are not initialized by the can.Message constructor.
msg.timestamp = last_msg.timestamp
msg.channel = last_msg.channel
self.assertMessageEqual(msg, last_msg)

bus1.shutdown()
bus2.shutdown()

Expand Down