Jenkins HIL test run various commands to inspect system

Tools/HIL/monitor_firmware_upload.py

@@ -6,21 +6,36 @@ from subprocess import call, Popen
 from argparse import ArgumentParser
 import re
 
-def monitor_firmware_upload(port, baudrate):     
+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, 100)
+    ser = serial.Serial(port, baudrate, databits, parity, stopbits, timeout=10)
 
     finished = 0
 
+    timeout = 30  # 30 seconds
+    timeout_start = time.time()
+    timeout_newline = time.time()
+
     while finished == 0:
         serial_line = ser.readline()
-        print(serial_line.replace('\n','')) 
+        print(serial_line.replace('\n',''))
 
         if "NuttShell (NSH)" in serial_line:
             finished = 1
-        time.sleep(0.05)
+            break
+
+        if time.time() > timeout_start + timeout:
+            print("Error, timeout")
+            finished = 1
+            break
+
+        # newline every 30 seconds if still running
+        if time.time() - timeout_newline > 30:
+            ser.write('\n')
+            timeout_newline = time.time()
+
     ser.close()
 
 def main():

Tools/HIL/run_nsh_cmd.py

@@ -0,0 +1,77 @@
+#! /usr/bin/python
+
+import serial, time
+import subprocess
+from subprocess import call, Popen
+from argparse import ArgumentParser
+import re
+
+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\n')
+
+    finished = 0
+    success = False
+
+    timeout = 10  # 10 seconds
+    timeout_start = time.time()
+
+    while finished == 0:
+        serial_line = ser.readline()
+        print(serial_line.replace('\n',''))
+
+        if "nsh>" in serial_line:
+            finished = 1
+
+        if time.time() > timeout_start + timeout:
+            print("Error, timeout")
+            finished = 1
+            break
+
+    # 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()
+
+    while finished == 0:
+        serial_line = ser.readline()
+        print(serial_line.replace('\n',''))
+
+        if cmd in serial_line:
+            continue
+        elif "nsh>" in serial_line:
+            finished = 1
+            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.close()
+
+def main():
+    parser = ArgumentParser(description=__doc__)
+    parser.add_argument('--device', "-d", nargs='?', default = None, help='')
+    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()
+
+    do_nsh_cmd(args.device, args.baudrate, args.cmd)
+
+if __name__ == "__main__":
+   main()

Tools/HIL/run_tests.py

@@ -10,22 +10,38 @@ 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, 100)
+    ser = serial.Serial(port, baudrate, databits, parity, stopbits, timeout=10)
+
     ser.write('\n\n')
 
     finished = 0
+    success = False
+
+    timeout = 10  # 10 seconds
+    timeout_start = time.time()
+
     while finished == 0:
         serial_line = ser.readline()
         print(serial_line.replace('\n',''))
 
         if "nsh>" in serial_line:
             finished = 1
-        time.sleep(0.05)
 
+        if time.time() > timeout_start + timeout:
+            print("Error, timeout")
+            finished = 1
+            break
+
+
+    # run test
     ser.write('tests ' + test_name + '\n')
+    time.sleep(0.05)
 
     finished = 0
-    success = False
+    timeout = 300  # 5 minutes
+    timeout_start = time.time()
+    timeout_newline = time.time()
+
     while finished == 0:
         serial_line = ser.readline()
         print(serial_line.replace('\n',''))
@@ -37,7 +53,17 @@ def do_test(port, baudrate, test_name):
             finished = 1
             success = False
 
-        time.sleep(0.05)
+        if time.time() > timeout_start + timeout:
+            print("Error, timeout")
+            print(test_name + " FAILED")
+            finished = 1
+            success = False
+            break
+
+        # newline every 30 seconds if still running
+        if time.time() - timeout_newline > 30:
+            ser.write('\n')
+            timeout_newline = time.time()
 
     ser.close()