kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-25 06:23:53 +01:00
Code Releases Activity

Merge pull request #14229 from keestux/fix-test-mutex-order

Browse Source 
tests/mutex_order: refactor the test to avoid knowing the thread IDs
This commit is contained in:
Alexandre Abadie 2020-06-10 10:28:15 +02:00 committed by GitHub
commit 31e22d9e00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tests/mutex_order/tests/01-run.py
View File

@ -10,26 +10,29 @@
import sys
from testrunner import run
thread_prio = {
3: 6,
4: 4,
5: 0,
6: 2,
7: 1
}
NUM_THREADS = 5
def testfunc(child):
for k in thread_prio.keys():
child.expect_exact("T{} (prio {}): trying to lock mutex now"
.format(k, thread_prio[k]))
last = -1
for i in range(len(thread_prio)):
child.expect(r"T\d+ \(prio (\d+)\): locked mutex now")
assert(int(child.match.group(1)) > last)
last = int(child.match.group(1))
# First collect the thread info how they are created
# A number of lines with:
# T4 (prio 6): waiting on condition variable now
thread_prios = {}
for nr in range(NUM_THREADS):
child.expect(r"T(\d+) \(prio (\d+)\): trying to lock mutex now")
thread_id = int(child.match.group(1))
thread_prio = int(child.match.group(2))
thread_prios[thread_id] = thread_prio
last_prio = -1
for _ in range(len(thread_prios)):
child.expect(r"T(\d+) \(prio (\d+)\): locked mutex now")
thread_id = int(child.match.group(1))
thread_prio = int(child.match.group(2))
assert thread_prios[thread_id] == thread_prio
assert thread_prio > last_prio
last_prio = thread_prio
if __name__ == "__main__":