Skip to content

Fix timeout in longitudinal test #772

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
rbiasini merged 2 commits into from
Aug 1, 2019
Merged

Fix timeout in longitudinal test #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2f29d2
Fix timeout in longitudinal test
pd0wm Jul 31, 2019
c2e4816
0 is not no timeout
pd0wm Jul 31, 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
4 changes: 3 additions & 1 deletion selfdrive/controls/controlsd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env python
import os
import gc
import capnp
from cereal import car, log
Expand Down Expand Up @@ -440,7 +441,8 @@ def controlsd_thread(gctx=None):
logcan.close()

# TODO: Use the logcan socket from above, but that will currenly break the tests
can_sock = messaging.sub_sock(service_list['can'].port, timeout=100)
can_timeout = None if os.environ.get('NO_CAN_TIMEOUT', False) else 100
can_sock = messaging.sub_sock(service_list['can'].port, timeout=can_timeout)

car_recognized = CP.carName != 'mock'
# If stock camera is disconnected, we loaded car controls and it's not chffrplus
Expand Down
1 change: 1 addition & 0 deletions selfdrive/test/tests/plant/test_longitudinal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ def setup_output():
class LongitudinalControl(unittest.TestCase):
@classmethod
def setUpClass(cls):
os.environ['NO_CAN_TIMEOUT'] = "1"

setup_output()

Expand Down