Skip to content

Commit 0a1af4d

Browse files
committed
Add option to start visualization for pytest.
Signed-off-by: Jelmer de Wolde <jelmer.de.wolde@alliander.com>
1 parent c8eff29 commit 0a1af4d

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

conftest.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,9 @@ def create_compose_file(request: SubRequest) -> list:
144144
else:
145145
compose.mode = "configuration"
146146
compose.predefined_configuration = PredefinedConfigurations()
147-
compose.visualization = False
147+
compose.visualization = (
148+
os.getenv("VISUALIZATION", default="false").lower() == "true"
149+
)
148150

149151
platform_list = PlatformList()
150152
platform_list.platforms = request.cls.platforms.values()

start.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,8 @@ def apply_env_settings(self, service: dict, service_type: SERVICE) -> None:
301301
env_vars = service.get("environment", [])
302302
if self.predefined_configuration.sim_conf.load_ui:
303303
env_vars.append("GAZEBO_UI=true")
304+
if self.visualization:
305+
env_vars.append("VISUALIZATION=true")
304306
if self.dev:
305307
env_vars.append("DEV_MOUNTS=true")
306308
env_vars.append(f"HOST_CWD={Compose.host_cwd}")
@@ -518,15 +520,15 @@ def run_compose(self) -> int:
518520
config_setup = PredefinedConfigurations()
519521
config_setup.sim_conf.load_ui = args.ui
520522
compose.dev = args.dev
523+
compose.simulator = not args.hardware
524+
compose.visualization = args.visualization
525+
compose.joystick = args.joystick
526+
compose.gazebo_ui = args.ui
521527
if args.configuration:
522528
config_setup.apply_configuration(args.configuration)
523-
compose.simulator = not args.hardware
524-
compose.visualization = args.visualization
525-
compose.joystick = args.joystick
526529
compose.mode = "configuration"
527530
elif isinstance(args.pytest, list):
528531
arguments = " " + " ".join(args.pytest)
529-
compose.gazebo_ui = args.ui
530532
compose.mode = "pytest"
531533
elif isinstance(args.pytest_no_nvidia, list):
532534
arguments = " " + " ".join(args.pytest_no_nvidia)

0 commit comments

Comments
 (0)