@@ -39,8 +39,9 @@ def flash_jlink(sn, dev, firmware):
3939 f .close ()
4040 ret = subprocess .run (f'JLinkExe -USB { sn } -device { dev } -if swd -JTAGConf -1,-1 -speed auto -NoGui 1 -ExitOnError 1 -CommandFile flash.jlink' ,
4141 shell = True , stdout = subprocess .PIPE , stderr = subprocess .STDOUT )
42- os .remove ('flash.jlink' )
43- assert ret .returncode == 0 , 'Flash failed'
42+ stdout = ret .stdout .decode ()
43+ os .remove ('flash.jlink' )
44+ assert ret .returncode == 0 , 'Flash failed\n ' + stdout
4445
4546def test_cdc_dual_ports (id ):
4647 port1 = f'/dev/ttyUSB_{ id [- 8 :]} .00'
@@ -55,7 +56,7 @@ def test_cdc_dual_ports(id):
5556
5657 assert os .path .exists (port1 ) and os .path .exists (port2 ), \
5758 'Device not available'
58-
59+
5960 # Echo test
6061 ser1 = serial .Serial (port1 )
6162 ser2 = serial .Serial (port2 )
@@ -90,16 +91,16 @@ def test_cdc_msc(id):
9091
9192 assert os .path .exists (port ) and os .path .exists (block ), \
9293 'Device not available'
93-
94+
9495 # Echo test
95- ser = serial .Serial (port )
96+ ser1 = serial .Serial (port )
9697
97- ser .timeout = 1
98+ ser1 .timeout = 1
9899
99100 str = b"test_str"
100- ser .write (str )
101- ser .flush ()
102- assert ser .read (100 ) == str , 'Port wrong data'
101+ ser1 .write (str )
102+ ser1 .flush ()
103+ assert ser1 .read (100 ) == str , 'Port wrong data'
103104
104105 # Block test
105106 f = open (block , 'rb' )
@@ -124,12 +125,12 @@ def test_dfu(id):
124125 break
125126 time .sleep (1 )
126127 timeout = timeout - 1
127-
128+
128129 assert timeout , 'Device not available'
129-
130+
130131 # Test upload
131132 try :
132- os .remove ('dfu0' )
133+ os .remove ('dfu0' )
133134 os .remove ('dfu1' )
134135 except OSError :
135136 pass
@@ -148,7 +149,7 @@ def test_dfu(id):
148149 with open ('dfu1' ) as f :
149150 assert 'Hello world from TinyUSB DFU! - Partition 1' in f .read (), 'Wrong uploaded data'
150151
151- os .remove ('dfu0' )
152+ os .remove ('dfu0' )
152153 os .remove ('dfu1' )
153154
154155 print ('dfu test done' )
@@ -164,7 +165,7 @@ def test_dfu_runtime(id):
164165 break
165166 time .sleep (1 )
166167 timeout = timeout - 1
167-
168+
168169 assert timeout , 'Device not available'
169170
170171 print ('dfu_runtime test done' )
@@ -173,11 +174,11 @@ def test_dfu_runtime(id):
173174if __name__ == '__main__' :
174175 with open (f'{ os .path .dirname (__file__ )} /hitl_config.json' ) as f :
175176 config = json .load (f )
176-
177+
177178 for device in config ['devices' ]:
178179 print (f"Testing device:{ device ['device' ]} " )
179180 for test in device ['tests' ]:
180- if device ['debugger' ] == 'jlink' :
181+ if device ['debugger' ]. lower () == 'jlink' :
181182 flash_jlink (device ['debugger_sn' ], device ['device' ], test ['firmware' ])
182183 else :
183184 # ToDo
0 commit comments