Commit af6e264b authored by dmarc-noreply@freelists.org's avatar dmarc-noreply@freelists.org Committed by Craig Small

tests: fix regexp in ps_sched_batch.exp to match in first line

The current regexp checks for a \s+ in the beginning, however that will
only match if there is a \n in the `ps` output before test-schedbatch,
but that will not happen if test-schedbatch is the first process in the
list, which happens if the PID of test-schedbatch is low enough to bring
it up in the sorted list.

Fix it by enabling newline-sensitive matching with (?n) which then
allows using ^ and $ anchors in the regexp (including an optional \r
introduced by expect.) Matching the end of line also improves checking
that the last field matches 18 exactly and not something like 181, etc.

Tested that `make check` does not break and also fixed the flakiness
seen in an environment with few processes running under the test user
which made the issue more frequent.
Signed-off-by: Filipe Brandenburger's avatarFilipe Brandenburger <filbranden@google.com>
Signed-off-by: Craig Small's avatarCraig Small <csmall@enc.com.au>
parent e981f2bb
......@@ -8,4 +8,4 @@ spawn $schedbatch 18
set test "ps SCHED_BATCH scheduler"
spawn $ps --no-header -o comm,cls,nice -a
expect_pass "$test" "\\s+test-schedbatch\\s+B\\s+18"
expect_pass "$test" "(?n)^test-schedbatch\\s+B\\s+18\\r?\$"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment