Skip to content

Commit

Permalink
autotest: remove pointless manipulation of expect list
Browse files Browse the repository at this point in the history
start_sitl and start_mavproxy already do this stuff
  • Loading branch information
peterbarker committed Feb 18, 2021
1 parent dcc04cc commit 2d17f01
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions Tools/autotest/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -5440,6 +5440,7 @@ def start_mavproxy(self):

# self.progress("Waiting for Parameters")
# self.mavproxy.expect('Received [0-9]+ parameters')
self.expect_list_add(self.mavproxy)

def start_SITL(self, **sitl_args):
start_sitl_args = {
Expand Down Expand Up @@ -5498,12 +5499,6 @@ def init(self):

util.expect_setup_callback(self.mavproxy, self.expect_callback)

self.expect_list_clear()
if self.sup_prog is not None:
self.expect_list_extend([self.sitl, self.mavproxy])
else:
self.expect_list_extend([self.sitl, self.mavproxy, self.sup_prog])

# need to wait for a heartbeat to arrive as then mavutil will
# select the correct set of messages for us to receive in
# self.mav.messages. You can actually recieve messages with
Expand Down

0 comments on commit 2d17f01

Please sign in to comment.