mavsdk_tests: remove waitforgz helper, add sleep

This is an attempt to workaround the gz spawn timeout in CI.
Let's just hard-code a sleep before spawning the model.
This commit is contained in:
Julian Oes
2020-04-08 15:13:18 +02:00
parent 0a7cde4819
commit 54fe3c5fd5
3 changed files with 6 additions and 39 deletions
+6 -8
View File
@@ -9,6 +9,7 @@ import psutil # type: ignore
import signal
import subprocess
import sys
import time
from logger_helper import color, colorize
import process_helper as ph
from typing import Any, Dict, List, NoReturn, TextIO, Optional
@@ -382,14 +383,6 @@ class Tester:
self.verbose)
self.active_runners.append(gzserver_runner)
waitforgz_runner = ph.WaitforgzRunner(
os.getcwd(),
log_dir,
test['model'],
case,
self.verbose)
self.active_runners.append(waitforgz_runner)
gzmodelspawn_runner = ph.GzmodelspawnRunner(
os.getcwd(),
log_dir,
@@ -428,6 +421,11 @@ class Tester:
.format(runner.name))
break
# Workaround to prevent gz not being able to communicate
# with gzserver
if runner.name == "gzserver":
time.sleep(10)
if abort:
self.stop_runners()
sys.exit(1)