diff --git a/tools/sim/bridge.py b/tools/sim/bridge.py index a6f4672e68..0b07c1b0e5 100755 --- a/tools/sim/bridge.py +++ b/tools/sim/bridge.py @@ -21,7 +21,6 @@ from common.numpy_fast import clip from common.params import Params from common.realtime import DT_DMON, Ratekeeper from selfdrive.car.honda.values import CruiseButtons -from selfdrive.manager.helpers import unblock_stdout from selfdrive.test.helpers import set_params_enabled from tools.sim.lib.can import can_function @@ -512,7 +511,6 @@ class CarlaBridge: t.join() def run(self, queue, retries=-1): - unblock_stdout() # Fix error when publishing too many lag message bridge_p = Process(target=self.bridge_keep_alive, args=(queue, retries), daemon=True) bridge_p.start() return bridge_p diff --git a/tools/sim/test/test_carla_integration.py b/tools/sim/test/test_carla_integration.py index 8801a432fd..e70e881f0f 100755 --- a/tools/sim/test/test_carla_integration.py +++ b/tools/sim/test/test_carla_integration.py @@ -5,6 +5,7 @@ import unittest from multiprocessing import Queue from cereal import messaging +from selfdrive.manager.helpers import unblock_stdout from tools.sim import bridge from tools.sim.bridge import CarlaBridge @@ -21,6 +22,8 @@ class TestCarlaIntegration(unittest.TestCase): subprocess.run("docker rm -f carla_sim", shell=True, stderr=subprocess.PIPE, check=False) self.processes.append(subprocess.Popen(".././start_carla.sh")) + # Too many lagging messages in bridge.py can cause a crash. This prevents it. + unblock_stdout() def test_run_bridge(self): # Test bridge connect with carla and runs without any errors for 60 seconds