Skip to content

Commit 8895e91

Browse files
committed
Merge pull request #929 from PrzemekWirkus/mbed_assert_3
Test suite - mbed assert detection
2 parents 1b2a621 + dfa9599 commit 8895e91

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

workspace_tools/host_tests/host_test.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ def __init__(self):
259259
self.RESULT_IOERR_COPY = "ioerr_copy"
260260
self.RESULT_PASSIVE = "passive"
261261
self.RESULT_NOT_DETECTED = "not_detected"
262+
self.RESULT_MBED_ASSERT = "mbed_assert"
262263

263264

264265
import workspace_tools.host_tests as host_tests

workspace_tools/test_api.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ class SingleTestRunner(object):
122122
TEST_RESULT_IOERR_SERIAL = "IOERR_SERIAL"
123123
TEST_RESULT_TIMEOUT = "TIMEOUT"
124124
TEST_RESULT_NO_IMAGE = "NO_IMAGE"
125+
TEST_RESULT_MBED_ASSERT = "MBED_ASSERT"
125126

126127
GLOBAL_LOOPS_COUNT = 1 # How many times each test should be repeated
127128
TEST_LOOPS_LIST = [] # We redefine no.of loops per test_id
@@ -139,7 +140,8 @@ class SingleTestRunner(object):
139140
"ioerr_serial" : TEST_RESULT_IOERR_SERIAL,
140141
"timeout" : TEST_RESULT_TIMEOUT,
141142
"no_image" : TEST_RESULT_NO_IMAGE,
142-
"end" : TEST_RESULT_UNDEF
143+
"end" : TEST_RESULT_UNDEF,
144+
"mbed_assert" : TEST_RESULT_MBED_ASSERT
143145
}
144146

145147
def __init__(self,
@@ -565,7 +567,8 @@ def generate_test_summary(self, test_summary, shuffle_seed=None):
565567
self.TEST_RESULT_IOERR_DISK : 0,
566568
self.TEST_RESULT_IOERR_SERIAL : 0,
567569
self.TEST_RESULT_NO_IMAGE : 0,
568-
self.TEST_RESULT_TIMEOUT : 0
570+
self.TEST_RESULT_TIMEOUT : 0,
571+
self.TEST_RESULT_MBED_ASSERT : 0
569572
}
570573

571574
for test in test_summary:
@@ -878,6 +881,11 @@ def get_auto_property_value(property_name, line):
878881
update_once_flag['timeout'] = True
879882
duration = int(auto_timeout_val)
880883

884+
# Detect mbed assert:
885+
if 'mbed assertation failed: ' in line:
886+
output.append('{{mbed_assert}}')
887+
break
888+
881889
# Check for test end
882890
if '{end}' in line:
883891
break

0 commit comments

Comments
 (0)