yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 09:22:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

mavsdk_tests: don't fail if DISPLAY is not set

Browse Source
This commit is contained in:
Julian Oes
2020-04-08 17:55:12 +02:00
parent 28ec3744a6
commit cc0b834d15
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/mavsdk_tests/process_helper.py
View File

@@ -132,6 +132,10 @@ class Runner:
def time_elapsed_s(self) -> float: def time_elapsed_s(self) -> float:
return time.time() - self.start_time return time.time() - self.start_time
def add_to_env_if_set(self, var: str) -> None:
if var in os.environ:
self.env[var] = os.environ[var]
class Px4Runner(Runner): class Px4Runner(Runner):
def __init__(self, workspace_dir: str, log_dir: str, def __init__(self, workspace_dir: str, log_dir: str,
@@ -189,8 +193,8 @@ class GzserverRunner(Runner):
workspace_dir + "/build/px4_sitl_default/build_gazebo", workspace_dir + "/build/px4_sitl_default/build_gazebo",
"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']} self.add_to_env_if_set("DISPLAY")
self.add_to_env_if_set("PX4_HOME_LAT") self.add_to_env_if_set("PX4_HOME_LAT")
self.add_to_env_if_set("PX4_HOME_LON") self.add_to_env_if_set("PX4_HOME_LON")
self.add_to_env_if_set("PX4_HOME_ALT") self.add_to_env_if_set("PX4_HOME_ALT")
@@ -199,10 +203,6 @@ class GzserverRunner(Runner):
workspace_dir + "/Tools/sitl_gazebo/worlds/" + workspace_dir + "/Tools/sitl_gazebo/worlds/" +
"empty.world"] "empty.world"]
def add_to_env_if_set(self, var: str) -> None:
if var in os.environ:
self.env[var] = os.environ[var]
class GzmodelspawnRunner(Runner): class GzmodelspawnRunner(Runner):
def __init__(self, def __init__(self,
@@ -219,8 +219,8 @@ class GzmodelspawnRunner(Runner):
"GAZEBO_PLUGIN_PATH": "GAZEBO_PLUGIN_PATH":
workspace_dir + "/build/px4_sitl_default/build_gazebo", workspace_dir + "/build/px4_sitl_default/build_gazebo",
"GAZEBO_MODEL_PATH": "GAZEBO_MODEL_PATH":
workspace_dir + "/Tools/sitl_gazebo/models", workspace_dir + "/Tools/sitl_gazebo/models"}
"DISPLAY": os.environ['DISPLAY']} self.add_to_env_if_set("DISPLAY")
self.cmd = "gz" self.cmd = "gz"
self.args = ["model", "--spawn-file", workspace_dir + self.args = ["model", "--spawn-file", workspace_dir +
"/Tools/sitl_gazebo/models/" + "/Tools/sitl_gazebo/models/" +
@@ -242,8 +242,8 @@ class GzclientRunner(Runner):
self.env = {"PATH": os.environ['PATH'], self.env = {"PATH": os.environ['PATH'],
"HOME": os.environ['HOME'], "HOME": os.environ['HOME'],
"GAZEBO_MODEL_PATH": "GAZEBO_MODEL_PATH":
workspace_dir + "/Tools/sitl_gazebo/models", workspace_dir + "/Tools/sitl_gazebo/models"}
"DISPLAY": os.environ['DISPLAY']} self.add_to_env_if_set("DISPLAY")
self.cmd = "gzclient" self.cmd = "gzclient"
self.args = ["--verbose"] self.args = ["--verbose"]