Browse Source

autotest: fixed CopterAVC test

master
Andrew Tridgell 10 years ago
parent
commit
68515d0324
  1. 2
      Tools/autotest/arducopter.py
  2. 4
      Tools/autotest/pysim/util.py

2
Tools/autotest/arducopter.py

@ -1271,7 +1271,7 @@ def fly_CopterAVC(viewerip=None, map=False):
util.pexpect_close(mavproxy) util.pexpect_close(mavproxy)
util.pexpect_close(sil) util.pexpect_close(sil)
sil = util.start_SIL('ArduCopter', height=HOME.alt, model='+', home=home, speedup=10) sil = util.start_SIL('ArduCopter', model='+', home=home, speedup=10)
options = '--sitl=127.0.0.1:5501 --out=127.0.0.1:19550 --quadcopter --streamrate=5' options = '--sitl=127.0.0.1:5501 --out=127.0.0.1:19550 --quadcopter --streamrate=5'
if viewerip: if viewerip:
options += ' --out=%s:14550' % viewerip options += ' --out=%s:14550' % viewerip

4
Tools/autotest/pysim/util.py

@ -105,7 +105,7 @@ def pexpect_drain(p):
except pexpect.TIMEOUT: except pexpect.TIMEOUT:
pass pass
def start_SIL(atype, valgrind=False, wipe=False, height=None, synthetic_clock=True, home=None, model=None, speedup=1): def start_SIL(atype, valgrind=False, wipe=False, synthetic_clock=True, home=None, model=None, speedup=1):
'''launch a SIL instance''' '''launch a SIL instance'''
import pexpect import pexpect
cmd="" cmd=""
@ -117,8 +117,6 @@ def start_SIL(atype, valgrind=False, wipe=False, height=None, synthetic_clock=Tr
cmd += executable cmd += executable
if wipe: if wipe:
cmd += ' -w' cmd += ' -w'
if height is not None:
cmd += ' -H %u' % height
if synthetic_clock: if synthetic_clock:
cmd += ' -S' cmd += ' -S'
if home is not None: if home is not None:

Loading…
Cancel
Save