@@ -39,8 +39,9 @@ def flash_jlink(sn, dev, firmware):
39
39
f .close ()
40
40
ret = subprocess .run (f'JLinkExe -USB { sn } -device { dev } -if swd -JTAGConf -1,-1 -speed auto -NoGui 1 -ExitOnError 1 -CommandFile flash.jlink' ,
41
41
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
44
45
45
46
def test_cdc_dual_ports (id ):
46
47
port1 = f'/dev/ttyUSB_{ id [- 8 :]} .00'
@@ -55,7 +56,7 @@ def test_cdc_dual_ports(id):
55
56
56
57
assert os .path .exists (port1 ) and os .path .exists (port2 ), \
57
58
'Device not available'
58
-
59
+
59
60
# Echo test
60
61
ser1 = serial .Serial (port1 )
61
62
ser2 = serial .Serial (port2 )
@@ -90,16 +91,16 @@ def test_cdc_msc(id):
90
91
91
92
assert os .path .exists (port ) and os .path .exists (block ), \
92
93
'Device not available'
93
-
94
+
94
95
# Echo test
95
- ser = serial .Serial (port )
96
+ ser1 = serial .Serial (port )
96
97
97
- ser .timeout = 1
98
+ ser1 .timeout = 1
98
99
99
100
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'
103
104
104
105
# Block test
105
106
f = open (block , 'rb' )
@@ -124,12 +125,12 @@ def test_dfu(id):
124
125
break
125
126
time .sleep (1 )
126
127
timeout = timeout - 1
127
-
128
+
128
129
assert timeout , 'Device not available'
129
-
130
+
130
131
# Test upload
131
132
try :
132
- os .remove ('dfu0' )
133
+ os .remove ('dfu0' )
133
134
os .remove ('dfu1' )
134
135
except OSError :
135
136
pass
@@ -148,7 +149,7 @@ def test_dfu(id):
148
149
with open ('dfu1' ) as f :
149
150
assert 'Hello world from TinyUSB DFU! - Partition 1' in f .read (), 'Wrong uploaded data'
150
151
151
- os .remove ('dfu0' )
152
+ os .remove ('dfu0' )
152
153
os .remove ('dfu1' )
153
154
154
155
print ('dfu test done' )
@@ -164,7 +165,7 @@ def test_dfu_runtime(id):
164
165
break
165
166
time .sleep (1 )
166
167
timeout = timeout - 1
167
-
168
+
168
169
assert timeout , 'Device not available'
169
170
170
171
print ('dfu_runtime test done' )
@@ -173,11 +174,11 @@ def test_dfu_runtime(id):
173
174
if __name__ == '__main__' :
174
175
with open (f'{ os .path .dirname (__file__ )} /hitl_config.json' ) as f :
175
176
config = json .load (f )
176
-
177
+
177
178
for device in config ['devices' ]:
178
179
print (f"Testing device:{ device ['device' ]} " )
179
180
for test in device ['tests' ]:
180
- if device ['debugger' ] == 'jlink' :
181
+ if device ['debugger' ]. lower () == 'jlink' :
181
182
flash_jlink (device ['debugger_sn' ], device ['device' ], test ['firmware' ])
182
183
else :
183
184
# ToDo
0 commit comments