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

Jenkins: HIL script minor improvements

Browse Source 
- periodically send newline while checking for output or command completion (back to nsh prompt)
 - mtd test
 - fix adc test (now board_adc)
This commit is contained in:
Daniel Agar
2020-09-28 16:41:28 -04:00
committed by GitHub
parent c342ab91b3
commit faccb0d948
3 changed files with 53 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Tools/HIL/run_nsh_cmd.py
View File

@@ -12,7 +12,7 @@ def do_nsh_cmd(port, baudrate, cmd):
parity = serial.PARITY_NONE
ser = serial.Serial(port, baudrate, databits, parity, stopbits, timeout=10)
ser.write('\n\n')
ser.write('\n')
finished = 0
success = False
@@ -20,47 +20,47 @@ def do_nsh_cmd(port, baudrate, cmd):
timeout = 10 # 10 seconds
timeout_start = time.time()
while finished == 0:
while True:
serial_line = ser.readline()
print(serial_line.replace('\n',''))
if "nsh>" in serial_line:
finished = 1
break
elif "NuttShell (NSH)" in serial_line:
break
if time.time() > timeout_start + timeout:
print("Error, timeout")
finished = 1
break
ser.write('\n')
time.sleep(0.01)
# run command
ser.write(cmd + '\n')
time.sleep(0.05)
ser.write('\n')
finished = 0
timeout = 30 # 30 seconds
timeout_start = time.time()
timeout_newline = time.time()
timeout_newline = timeout_start
while finished == 0:
while True:
serial_line = ser.readline()
print(serial_line.replace('\n',''))
if cmd in serial_line:
continue
elif "nsh>" in serial_line:
finished = 1
break
elif "NuttShell (NSH)" in serial_line:
break
if time.time() > timeout_start + timeout:
print("Error, timeout")
finished = 1
break
# newline every 10 seconds if still running
if time.time() - timeout_newline > 10:
ser.write('\n')
timeout_newline = time.time()
ser.write('\n')
time.sleep(0.01)
ser.close()

43
Tools/HIL/run_tests.py
View File

@@ -14,7 +14,7 @@ def do_test(port, baudrate, test_name):
parity = serial.PARITY_NONE
ser = serial.Serial(port, baudrate, databits, parity, stopbits, timeout=10)
ser.write('\n\n')
ser.write('\n')
finished = 0
success = False
@@ -22,43 +22,53 @@ def do_test(port, baudrate, test_name):
timeout = 10 # 10 seconds
timeout_start = time.time()
while finished == 0:
while True:
serial_line = ser.readline()
print(serial_line.replace('\n',''))
if "nsh>" in serial_line:
finished = 1
break
elif "NuttShell (NSH)" in serial_line:
break
if time.time() > timeout_start + timeout:
print("Error, timeout")
finished = 1
break
ser.write('\n')
time.sleep(0.01)
# run test
ser.write('tests ' + test_name + '\n')
time.sleep(0.05)
finished = 0
timeout = 300 # 5 minutes
# run test cmd
cmd = 'tests ' + test_name
ser.write(cmd + '\n')
timeout = 180 # 3 minutes
timeout_start = time.time()
timeout_newline = time.time()
timeout_newline = timeout_start
while finished == 0:
while True:
serial_line = ser.readline()
print(serial_line.replace('\n',''))
if test_name + " PASSED" in serial_line:
finished = 1
if cmd in serial_line:
continue
elif test_name + " PASSED" in serial_line:
success = True
break
elif test_name + " FAILED" in serial_line:
finished = 1
success = False
break
elif "nsh>" in serial_line:
success = False
break
elif "NuttShell (NSH)" in serial_line:
success = False
break
if time.time() > timeout_start + timeout:
print("Error, timeout")
print(test_name + " FAILED")
finished = 1
success = False
break
@@ -93,9 +103,6 @@ class TestHadrwareMethods(unittest.TestCase):
def floattest_float(self):
self.assertTrue(do_test(self.TEST_DEVICE, self.TEST_BAUDRATE, "float"))
def hrttest_hrt(self):
self.assertTrue(do_test(self.TEST_DEVICE, self.TEST_BAUDRATE, "hrt"))
def test_hrt(self):
self.assertTrue(do_test(self.TEST_DEVICE, self.TEST_BAUDRATE, "hrt"))