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

Jenkins: HIL improve run_tests.py and run_nsh_cmd.py helper

Browse Source 
- switch to python3
 - run_nsh_cmd.py return error if command fails
 - decrease timeout in checking for output
 - Jenkins hardware tests tolerate certain command failures that aren't available on all boards (flash constrained, etc)
This commit is contained in:
Daniel Agar
2020-11-10 22:45:50 -05:00
committed by GitHub
parent ea09d9ebbf
commit 3924792c20
4 changed files with 159 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Tools/HIL/monitor_firmware_upload.py
View File

@@ -1,4 +1,4 @@
#! /usr/bin/python
#! /usr/bin/env python3
import serial, time
import subprocess
@@ -10,7 +10,7 @@ def monitor_firmware_upload(port, baudrate):
databits = serial.EIGHTBITS
stopbits = serial.STOPBITS_ONE
parity = serial.PARITY_NONE
ser = serial.Serial(port, baudrate, databits, parity, stopbits, timeout=10)
ser = serial.Serial(port, baudrate, databits, parity, stopbits, timeout=1)
finished = 0
@@ -19,8 +19,9 @@ def monitor_firmware_upload(port, baudrate):
timeout_newline = time.time()
while finished == 0:
serial_line = ser.readline()
print(serial_line.replace('\n',''))
serial_line = ser.readline().decode("utf-8", errors='ignore')
if (len(serial_line) > 0):
print(serial_line.replace('\n', ''))
if "NuttShell (NSH)" in serial_line:
finished = 1
@@ -36,16 +37,17 @@ def monitor_firmware_upload(port, baudrate):
finished = 1
break
# newline every 30 seconds if still running
if time.time() - timeout_newline > 30:
ser.write('\n')
# newline every 10 seconds if still running
if time.time() - timeout_newline > 10:
timeout_newline = time.time()
ser.write('\n'.encode("utf-8"))
ser.flush()
ser.close()
def main():
parser = ArgumentParser(description=__doc__)
parser.add_argument('--device', "-d", nargs='?', default = None, help='')
parser.add_argument('--device', "-d", nargs='?', default=None, help='', required=True)
parser.add_argument("--baudrate", "-b", dest="baudrate", type=int, help="Mavlink port baud rate (default=57600)", default=57600)
args = parser.parse_args()

82
Tools/HIL/run_nsh_cmd.py
View File

@@ -1,72 +1,74 @@
#! /usr/bin/python
#! /usr/bin/env python3
import serial, time
import subprocess
from subprocess import call, Popen
from argparse import ArgumentParser
import re
import sys
def do_nsh_cmd(port, baudrate, cmd):
databits = serial.EIGHTBITS
stopbits = serial.STOPBITS_ONE
parity = serial.PARITY_NONE
ser = serial.Serial(port, baudrate, databits, parity, stopbits, timeout=10)
ser.write('\n')
finished = 0
success = False
timeout = 10 # 10 seconds
timeout_start = time.time()
while True:
serial_line = ser.readline()
print(serial_line.replace('\n',''))
if "nsh>" in serial_line:
break
elif "NuttShell (NSH)" in serial_line:
break
if time.time() > timeout_start + timeout:
print("Error, timeout")
break
ser.write('\n')
time.sleep(0.01)
ser = serial.Serial(port, baudrate, databits, parity, stopbits, timeout=0.1)
# run command
ser.write(cmd + '\n')
timeout = 30 # 30 seconds
timeout_start = time.time()
timeout_newline = timeout_start
timeout = 10 # 10 seconds
success_cmd = "cmd succeeded!"
while True:
serial_line = ser.readline()
print(serial_line.replace('\n',''))
serial_cmd = '{0}; echo "{1}"\n'.format(cmd, success_cmd)
ser.write(serial_cmd.encode("utf-8"))
ser.flush()
serial_line = ser.readline().decode("utf-8", errors='ignore')
if cmd in serial_line:
continue
elif "nsh>" in serial_line:
break
elif "NuttShell (NSH)" in serial_line:
break
else:
print(serial_line.replace('\n', ''))
if time.time() > timeout_start + timeout:
print("Error, timeout")
sys.exit(-1)
break
ser.write('\n')
time.sleep(0.01)
time.sleep(1)
timeout_start = time.time()
timeout = 30 # 30 seconds
while True:
serial_line = ser.readline().decode("utf-8", errors='ignore')
if success_cmd in serial_line:
break
else:
if len(serial_line) > 0:
print(serial_line.replace('\n', ''))
if "nsh>" in serial_line:
sys.exit(-1) # error, command didn't complete successfully
elif "NuttShell (NSH)" in serial_line:
sys.exit(-1) # error, command didn't complete successfully
if len(serial_line) <= 0:
ser.write("\n".encode("utf-8"))
ser.flush()
if time.time() > timeout_start + timeout:
print("Error, timeout")
sys.exit(-1)
ser.close()
def main():
parser = ArgumentParser(description=__doc__)
parser.add_argument('--device', "-d", nargs='?', default = None, help='')
parser.add_argument('--device', "-d", nargs='?', default=None, help='', required=True)
parser.add_argument("--baudrate", "-b", dest="baudrate", type=int, help="Mavlink port baud rate (default=57600)", default=57600)
parser.add_argument("--cmd", "-c", dest="cmd", help="Command to run")
args = parser.parse_args()

59
Tools/HIL/run_tests.py
View File

@@ -1,4 +1,4 @@
#! /usr/bin/python
#! /usr/bin/env python3
import serial, time
import subprocess
@@ -7,52 +7,53 @@ from argparse import ArgumentParser
import re
import unittest
import os
import sys
def do_test(port, baudrate, test_name):
databits = serial.EIGHTBITS
stopbits = serial.STOPBITS_ONE
parity = serial.PARITY_NONE
ser = serial.Serial(port, baudrate, databits, parity, stopbits, timeout=10)
ser.write('\n')
ser = serial.Serial(port, baudrate, databits, parity, stopbits, timeout=1)
success = False
timeout = 10 # 10 seconds
# run test cmd
print('\n|======================================================================')
cmd = 'tests ' + test_name
print("| Running:", cmd)
print('|======================================================================')
timeout_start = time.time()
timeout = 10 # 10 seconds
while True:
serial_line = ser.readline()
print(serial_line.replace('\n',''))
serial_cmd = '{0}\n'.format(cmd)
ser.write(serial_cmd.encode("utf-8"))
ser.flush()
if "nsh>" in serial_line:
break
elif "NuttShell (NSH)" in serial_line:
serial_line = ser.readline().decode("utf-8", errors='ignore')
if cmd in serial_line:
break
else:
print(serial_line.replace('\n', ''))
if time.time() > timeout_start + timeout:
print("Error, timeout")
break
print("Error, unable to write cmd")
return False
ser.write('\n')
time.sleep(0.01)
time.sleep(1)
# run test cmd
cmd = 'tests ' + test_name
ser.write(cmd + '\n')
# print results, wait for final result (PASSED or FAILED)
timeout = 180 # 3 minutes
timeout_start = time.time()
timeout_newline = timeout_start
while True:
serial_line = ser.readline()
print(serial_line.replace('\n',''))
serial_line = ser.readline().decode("utf-8", errors='ignore')
if (len(serial_line) > 0):
print(serial_line.replace('\n', ''))
if cmd in serial_line:
continue
elif test_name + " PASSED" in serial_line:
if test_name + " PASSED" in serial_line:
success = True
break
elif test_name + " FAILED" in serial_line:
@@ -65,9 +66,9 @@ def do_test(port, baudrate, test_name):
success = False
break
# newline every 30 seconds if still running
if time.time() - timeout_newline > 30:
ser.write('\n')
# newline every 10 seconds if still running
if time.time() - timeout_newline > 10:
ser.write("\n".encode("utf-8"))
timeout_newline = time.time()
ser.close()
@@ -170,14 +171,14 @@ class TestHardwareMethods(unittest.TestCase):
def main():
parser = ArgumentParser(description=__doc__)
parser.add_argument('--device', "-d", nargs='?', default = None, help='')
parser.add_argument('--device', "-d", nargs='?', default=None, help='', required=True)
parser.add_argument("--baudrate", "-b", dest="baudrate", type=int, help="Mavlink port baud rate (default=57600)", default=57600)
args = parser.parse_args()
TestHardwareMethods.TEST_DEVICE = args.device
TestHardwareMethods.TEST_BAUDRATE = args.baudrate
unittest.main(__name__, argv=['main'])
unittest.main(__name__, failfast=True, verbosity=0, argv=['main'])
if __name__ == "__main__":
main()