mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2025-12-16 01:53:51 +01:00
tests/ps_schedstatistics: improve automatic test script
- Ensure the whole ps output is displayed in the terminal before exiting the script - Escape parenthesis in line regexp
This commit is contained in:
parent
c9fccbc34d
commit
f885b90bd9
@ -10,25 +10,25 @@ import sys
|
||||
from testrunner import run
|
||||
|
||||
PS_EXPECTED = (
|
||||
(r'\tpid | name | state Q | pri | stack ( used) | '
|
||||
(r'\tpid | name | state Q | pri | stack \( used\) | '
|
||||
r'base addr | current | runtime | switches'),
|
||||
(r'\t - | isr_stack | - - | - | \d+ ( -?\d+) | '
|
||||
(r'\t - | isr_stack | - - | - | \d+ \( -?\d+\) | '
|
||||
r'0x\d+ | 0x\d+'),
|
||||
(r'\t 1 | idle | pending Q | 15 | \d+ ( -?\d+) | '
|
||||
(r'\t 1 | idle | pending Q | 15 | \d+ \( -?\d+\) | '
|
||||
r'0x\d+ | 0x\d+ | \d+\.\d+% | \d+'),
|
||||
(r'\t 2 | main | running Q | 7 | \d+ ( -?\d+) | '
|
||||
(r'\t 2 | main | running Q | 7 | \d+ \( -?\d+\) | '
|
||||
r'0x\d+ | 0x\d+ | \d+\.\d+% | \d+'),
|
||||
(r'\t 3 | thread | bl rx _ | 6 | \d+ ( -?\d+) | '
|
||||
(r'\t 3 | thread | bl rx _ | 6 | \d+ \( -?\d+\) | '
|
||||
r'0x\d+ | 0x\d+ | \d+\.\d+% | \d+'),
|
||||
(r'\t 4 | thread | bl rx _ | 6 | \d+ ( -?\d+) | '
|
||||
(r'\t 4 | thread | bl rx _ | 6 | \d+ \( -?\d+\) | '
|
||||
r'0x\d+ | 0x\d+ | \d+\.\d+% | \d+'),
|
||||
(r'\t 5 | thread | bl rx _ | 6 | \d+ ( -?\d+) | '
|
||||
(r'\t 5 | thread | bl rx _ | 6 | \d+ \( -?\d+\) | '
|
||||
r'0x\d+ | 0x\d+ | \d+\.\d+% | \d+'),
|
||||
(r'\t 6 | thread | bl mutex _ | 6 | \d+ ( -?\d+) | '
|
||||
(r'\t 6 | thread | bl mutex _ | 6 | \d+ \( -?\d+\) | '
|
||||
r'0x\d+ | 0x\d+ | \d+\.\d+% | \d+'),
|
||||
(r'\t 7 | thread | bl rx _ | 6 | \d+ ( -?\d+) | '
|
||||
(r'\t 7 | thread | bl rx _ | 6 | \d+ \( -?\d+\) | '
|
||||
r'0x\d+ | 0x\d+ | \d+\.\d+% | \d+'),
|
||||
(r'\t | SUM | | | \d+ (\d+)')
|
||||
(r'\t | SUM | | | \d+ \(\d+\)')
|
||||
)
|
||||
|
||||
|
||||
@ -40,7 +40,7 @@ def _check_startup(child):
|
||||
|
||||
def _check_help(child):
|
||||
child.sendline('')
|
||||
child.expect('>')
|
||||
child.expect_exact('>')
|
||||
child.sendline('help')
|
||||
child.expect_exact('Command Description')
|
||||
child.expect_exact('---------------------------------------')
|
||||
@ -53,6 +53,8 @@ def _check_ps(child):
|
||||
child.sendline('ps')
|
||||
for line in PS_EXPECTED:
|
||||
child.expect(line)
|
||||
# Wait for all lines of the ps output to be displayed
|
||||
child.expect_exact('>')
|
||||
|
||||
|
||||
def testfunc(child):
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user