Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-02 03:49:12 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

mavsdk_tests: only env vars that are set

Browse Source 
Otherwise this raises a KeyError.
This commit is contained in:
Julian Oes
2020-03-18 13:31:18 +01:00
committed by Nuno Marques
parent 5ea40c57c6
commit ade39481ad
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/mavsdk_tests/process_helper.py
+8 -4
View File
@@ -183,15 +183,19 @@ class GzserverRunner(Runner):
"GAZEBO_MODEL_PATH": "GAZEBO_MODEL_PATH":
workspace_dir + "/Tools/sitl_gazebo/models", workspace_dir + "/Tools/sitl_gazebo/models",
"PX4_SIM_SPEED_FACTOR": str(speed_factor), "PX4_SIM_SPEED_FACTOR": str(speed_factor),
"DISPLAY": os.environ['DISPLAY'], "DISPLAY": os.environ['DISPLAY']}
"PX4_HOME_LAT": os.environ['PX4_HOME_LAT'], self.add_to_env_if_set("PX4_HOME_LAT")
"PX4_HOME_LON": os.environ['PX4_HOME_LON'], self.add_to_env_if_set("PX4_HOME_LON")
"PX4_HOME_ALT": os.environ['PX4_HOME_ALT']} self.add_to_env_if_set("PX4_HOME_ALT")
self.cmd = "gzserver" self.cmd = "gzserver"
self.args = ["--verbose", self.args = ["--verbose",
workspace_dir + "/Tools/sitl_gazebo/worlds/" + workspace_dir + "/Tools/sitl_gazebo/worlds/" +
self.model + ".world"] self.model + ".world"]
def add_to_env_if_set(self, var: str) -> None:
if var in os.environ:
self.env[var] = os.environ[var]
class GzclientRunner(Runner): class GzclientRunner(Runner):
def __init__(self, def __init__(self,