Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-23 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

autotest: terminate FTP session after transfering files

Browse Source 
race condition starting the second MAVProxy if the first session isn't terminated
This commit is contained in:
Peter Barker 2022-08-21 20:33:10 +10:00 committed by Peter Barker
parent b3e4306b70
commit 87eb703bc1
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tools/autotest/common.py
View File

@ -12288,11 +12288,15 @@ switch value'''
try: try:
mavproxy.send("module load ftp\n") mavproxy.send("module load ftp\n")
mavproxy.expect(["Loaded module ftp", "module ftp already loaded"]) mavproxy.expect(["Loaded module ftp", "module ftp already loaded"])
mavproxy.send("ftp set debug 1\n") # so we get the "Terminated session" message
mavproxy.send("ftp get %s %s\n" % (path, tmpfile.name)) mavproxy.send("ftp get %s %s\n" % (path, tmpfile.name))
mavproxy.expect("Getting") mavproxy.expect("Getting")
self.delay_sim_time(2) self.delay_sim_time(2)
mavproxy.send("ftp status\n") mavproxy.send("ftp status\n")
mavproxy.expect("No transfer in progress") mavproxy.expect("No transfer in progress")
# terminate the connection, or it may still be in progress the next time an FTP is attempted:
mavproxy.send("ftp cancel\n")
mavproxy.expect("Terminated session")
except Exception as e: except Exception as e:
self.print_exception_caught(e) self.print_exception_caught(e)
ex = e ex = e