From 01a3b3d75b43d9a9adac964be380e28c41444c31 Mon Sep 17 00:00:00 2001 From: eugenevinitsky Date: Fri, 8 Jun 2018 21:05:14 -0700 Subject: [PATCH 1/2] dont do the socket stuff when testing --- flow/envs/base_env.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/flow/envs/base_env.py b/flow/envs/base_env.py index 2c9a8982..0e2dd8c0 100755 --- a/flow/envs/base_env.py +++ b/flow/envs/base_env.py @@ -162,9 +162,10 @@ def start_sumo(self): port = self.sumo_params.port else: # backoff to decrease likelihood of race condition - time_stamp = ''.join(str(time.time()).split('.')) - time.sleep(2.0 * int(time_stamp[-6:]) / 1e6) - port = sumolib.miscutils.getFreeSocketPort() + if os.environ.get("TEST_FLAG", 0): + time_stamp = ''.join(str(time.time()).split('.')) + time.sleep(2.0 * int(time_stamp[-6:]) / 1e6) + port = sumolib.miscutils.getFreeSocketPort() # command used to start sumo sumo_call = [self.sumo_params.sumo_binary, From e7a1d5c041ac461f27be4e8b125f295f08a22f97 Mon Sep 17 00:00:00 2001 From: eugenevinitsky Date: Fri, 8 Jun 2018 21:08:51 -0700 Subject: [PATCH 2/2] dont backoff in tests --- flow/envs/base_env.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flow/envs/base_env.py b/flow/envs/base_env.py index 0e2dd8c0..8d93b1a3 100755 --- a/flow/envs/base_env.py +++ b/flow/envs/base_env.py @@ -161,8 +161,9 @@ def start_sumo(self): if self.sumo_params.port is not None: port = self.sumo_params.port else: - # backoff to decrease likelihood of race condition + # Don't do backoff when testing if os.environ.get("TEST_FLAG", 0): + # backoff to decrease likelihood of race condition time_stamp = ''.join(str(time.time()).split('.')) time.sleep(2.0 * int(time_stamp[-6:]) / 1e6) port = sumolib.miscutils.getFreeSocketPort()