fix: add env variable for CARLA path and blueprint tests with manual …

…skip

pyproject.toml

@@ -64,6 +64,7 @@ test-full = [  # like 'test' but adds dependencies for optional features
 	"scenic[test]",       # all dependencies from 'test' extra above
 	"scenic[guideways]",  # for running guideways modules
 	"astor >= 0.8.1",
+	"carla >= 0.9.12",
 	"dill",
 	"exceptiongroup",
 	"inflect ~= 5.5",
@@ -73,9 +74,6 @@ test-full = [  # like 'test' but adds dependencies for optional features
 	"sphinx-tabs ~= 3.4.1",
 	"verifai >= 2.1.0b1",
 ]
-test-sim = [
-	'carla >= 0.9.12; python_version <= "3.8" and (platform_system == "Linux" or platform_system == "Windows")',
-]
 dev = [
 	"scenic[test-full]",
 	"black ~= 24.0",

tests/conftest.py

@@ -1,4 +1,5 @@
 from contextlib import contextmanager
+import os
 import os.path
 from pathlib import Path
 import re
@@ -53,10 +54,18 @@ def loader(relpath, **kwargs):
     return loader
 
 
+def checkCarlaPath():
+    CARLA_ROOT = os.environment.get("CARLA_ROOT")
+    if not CARLA_ROOT:
+        pytest.skip("CARLA_ROOT env variable not set.")
+    return CARLA_ROOT
+
+
 @pytest.fixture
 def launchCarlaServer():
+    CARLA_ROOT = checkCarlaPath()
     carla_process = subprocess.Popen(
-        "bash /opt/carla-simulator/CarlaUE4.sh -RenderOffScreen", shell=True
+        f"bash {CARLA_ROOT}/CarlaUE4.sh -RenderOffScreen", shell=True
     )
     # NOTE: CARLA server takes time to start up
     time.sleep(3)