Skip to content

Commit 269be72

Browse files
committed
fixes #243 : skip timing/performance sensitive tests if running on Travis CI
1 parent 7afacef commit 269be72

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

test/back2back_test.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
import os
12
import unittest
23
import time
34

45
import can
56

7+
IS_TRAVIS = os.environ.get('TRAVIS', 'default') == 'true'
68

79
BITRATE = 500000
810
TIMEOUT = 0.1
@@ -67,6 +69,7 @@ def _send_and_receive(self, msg):
6769
def test_no_message(self):
6870
self.assertIsNone(self.bus1.recv(0.1))
6971

72+
@unittest.skipIf(IS_TRAVIS, "skip on Travis CI")
7073
def test_timestamp(self):
7174
self.bus2.send(can.Message())
7275
recv_msg1 = self.bus1.recv(TIMEOUT)

test/simplecyclic_test.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1+
import os
12
from time import sleep
23
import unittest
4+
35
import can
46

7+
IS_TRAVIS = os.environ.get('TRAVIS', 'default') == 'true'
58

69
class SimpleCyclicSendTaskTest(unittest.TestCase):
710

11+
@unittest.skipIf(IS_TRAVIS, "skip on Travis CI")
812
def test_cycle_time(self):
913
msg = can.Message(extended_id=False, arbitration_id=0x100, data=[0,1,2,3,4,5,6,7])
10-
bus = can.interface.Bus(bustype='virtual')
14+
bus1 = can.interface.Bus(bustype='virtual')
1115
bus2 = can.interface.Bus(bustype='virtual')
12-
task = bus.send_periodic(msg, 0.01, 1)
16+
task = bus1.send_periodic(msg, 0.01, 1)
1317
self.assertIsInstance(task, can.broadcastmanager.CyclicSendTaskABC)
1418

1519
sleep(5)
@@ -20,9 +24,8 @@ def test_cycle_time(self):
2024
last_msg = bus2.recv()
2125
self.assertEqual(last_msg, msg)
2226

23-
bus.shutdown()
27+
bus1.shutdown()
2428
bus2.shutdown()
2529

26-
2730
if __name__ == '__main__':
2831
unittest.main()

0 commit comments

Comments
 (0)