Skip to content

Commit a1c9c94

Browse files
committed
Added serial port wrappers for read/write instead of raw serial port access to access MUT serial port. This will allow to catch more issues with communication with MUT during tests. This will also 'hide' tracebacks from test suite execution.
1 parent 82e4a67 commit a1c9c94

8 files changed

+56
-15
lines changed

workspace_tools/host_tests/dev_null_auto.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@
2020

2121
class DevNullTest(DefaultTest):
2222
def run(self):
23-
c = self.mbed.serial.read(512)
23+
c = self.mbed.serial_read(512)
24+
if c is None:
25+
self.print_result("ioerr_serial")
26+
return
27+
# Data from serial received correctly
2428
print "Received %d bytes" % len(c)
2529
if "{failure}" not in c:
2630
self.print_result('success')

workspace_tools/host_tests/hello_auto.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ class HelloTest(DefaultTest):
2222
HELLO_WORLD = "Hello World\n"
2323

2424
def run(self):
25-
c = self.mbed.serial.read(len(self.HELLO_WORLD))
25+
c = self.mbed.serial_read(len(self.HELLO_WORLD))
26+
if c is None:
27+
self.print_result("ioerr_serial")
28+
return
2629
stdout.write(c)
2730
if c == self.HELLO_WORLD: # Hello World received
2831
self.print_result('success')

workspace_tools/host_tests/rtc_auto.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ def run(self):
2828
test_result = True
2929
c = self.mbed.serial.timeout = None
3030
for i in range(0, 5):
31-
c = self.mbed.serial.read(38) # 38 len("[1256729742] [2009-10-28 11:35:42 AM]\n"
31+
c = self.mbed.serial_read(38) # 38 len("[1256729742] [2009-10-28 11:35:42 AM]\n"
32+
if c is None:
33+
self.print_result("ioerr_serial")
34+
return
3235
stdout.flush()
3336
m = self.re_detect_rtc_value.search(c)
3437
if m and len(m.groups()):

workspace_tools/host_tests/stdio_auto.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ def run(self):
3737
ip_msg_timeout = self.mbed.options.timeout
3838
start_serial_pool = time();
3939
while (time() - start_serial_pool) < ip_msg_timeout:
40-
c = self.mbed.serial.read(512)
40+
c = self.mbed.serial_read(512)
41+
if c is None:
42+
self.print_result("ioerr_serial")
43+
return
4144
stdout.write(c)
4245
stdout.flush()
4346
serial_stdio_msg += c

workspace_tools/host_tests/tcpecho_server_auto.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ def run(self):
3434
serial_ip_msg = ""
3535
start_serial_pool = time();
3636
while (time() - start_serial_pool) < ip_msg_timeout:
37-
c = self.mbed.serial.read(512)
37+
c = self.mbed.serial_read(512)
38+
if c is None:
39+
self.print_result("ioerr_serial")
40+
return
3841
stdout.write(c)
3942
stdout.flush()
4043
serial_ip_msg += c
@@ -77,7 +80,10 @@ def run(self):
7780
# Receiving
7881
try:
7982
while True:
80-
c = self.mbed.serial.read(512)
83+
c = self.mbed.serial_read(512)
84+
if c is None:
85+
self.print_result("ioerr_serial")
86+
break
8187
stdout.write(c)
8288
stdout.flush()
8389
except KeyboardInterrupt, _:

workspace_tools/host_tests/udp_link_layer_auto.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,10 @@ def run(self):
7979
serial_ip_msg = ""
8080
start_serial_pool = time()
8181
while (time() - start_serial_pool) < ip_msg_timeout:
82-
c = self.mbed.serial.read(512)
82+
c = self.mbed.serial_read(512)
83+
if c is None:
84+
self.print_result("ioerr_serial")
85+
return
8386
stdout.write(c)
8487
stdout.flush()
8588
serial_ip_msg += c
@@ -141,7 +144,10 @@ def run(self):
141144
print "Remaining mbed serial port data:"
142145
try:
143146
while True:
144-
c = self.mbed.serial.read(512)
147+
c = self.mbed.serial_read(512)
148+
if c is None:
149+
self.print_result("ioerr_serial")
150+
break
145151
stdout.write(c)
146152
stdout.flush()
147153
except KeyboardInterrupt, _:

workspace_tools/host_tests/udpecho_server_auto.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ def run(self):
3434
serial_ip_msg = ""
3535
start_serial_pool = time();
3636
while (time() - start_serial_pool) < ip_msg_timeout:
37-
c = self.mbed.serial.read(512)
37+
c = self.mbed.serial_read(512)
38+
if c is None:
39+
self.print_result("ioerr_serial")
40+
return
3841
stdout.write(c)
3942
stdout.flush()
4043
serial_ip_msg += c
@@ -76,7 +79,10 @@ def run(self):
7679
# Receiving
7780
try:
7881
while True:
79-
c = self.mbed.serial.read(512)
82+
c = self.mbed.serial_read(512)
83+
if c is None:
84+
self.print_result("ioerr_serial")
85+
break
8086
stdout.write(c)
8187
stdout.flush()
8288
except KeyboardInterrupt, _:

workspace_tools/host_tests/wait_us_auto.py

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,26 @@ def run(self):
2424
test_result = True
2525
# First character to start test (to know after reset when test starts)
2626
self.mbed.serial.timeout = None
27-
c = self.mbed.serial.read(1)
27+
c = self.mbed.serial_read(1)
28+
if c is None:
29+
self.print_result("ioerr_serial")
30+
return
2831
if c == '$': # target will printout TargetID e.g.: $$$$1040e649d5c09a09a3f6bc568adef61375c6
2932
#Read additional 39 bytes of TargetID
30-
self.mbed.serial.read(39)
31-
c = self.mbed.serial.read(1) # Re-read first 'tick'
32-
33+
if not self.mbed.serial_read(39):
34+
self.print_result("ioerr_serial")
35+
return
36+
c = self.mbed.serial_read(1) # Re-read first 'tick'
37+
if c is None:
38+
self.print_result("ioerr_serial")
39+
return
3340
print "Test started"
3441
start_serial_pool = start = time();
3542
for i in range(0, 10):
36-
c = self.mbed.serial.read(1)
43+
c = self.mbed.serial_read(1)
44+
if c is None:
45+
self.print_result("ioerr_serial")
46+
return
3747
if i > 2: # we will ignore first few measurements
3848
delta = time() - start
3949
deviation = abs(delta - 1)

0 commit comments

Comments
 (0)