testing: fix expect matching of numbers

The sandbox timestamp should not be available for matching
when output is already expected from the next command
(this is only a problem if numeric output if expected from the
first command in the sandbox).

A possible alternative would be to flush the expect output buffer
with 'expect "*"' after the sandbox is up.

1 files changed, 8 insertions, 4 deletions

diff --git a/test/root/cgroup.exp b/test/root/cgroup.exp
index f64edf4b9..9a1bbe161 100755
--- a/test/root/cgroup.exp
+++ b/test/root/cgroup.exp
@@ -20,7 +20,7 @@ expect {
 send --  "firejail --name=\"join testing\" --cgroup=/sys/fs/cgroup/systemd/firejail/tasks\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 2
 
@@ -37,14 +37,18 @@ expect {
         timeout {puts "TESTING ERROR 3\n";exit}
         "Switching to pid"
 }
+expect {
+        timeout {puts "TESTING ERROR 4\n";exit}
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
+}
 sleep 1
 send -- "ps aux\r"
 expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
+        timeout {puts "TESTING ERROR 5\n";exit}
         "/bin/bash"
 }
 expect {
-        timeout {puts "TESTING ERROR 5\n";exit}
+        timeout {puts "TESTING ERROR 6\n";exit}
         "/bin/bash"
 }
 
@@ -53,7 +57,7 @@ after 100
 spawn $env(SHELL)
 send -- "wc -l /sys/fs/cgroup/systemd/firejail/tasks\r"
 expect {
-        timeout {puts "TESTING ERROR 6\n";exit}
+        timeout {puts "TESTING ERROR 7\n";exit}
         "3"
 }
 after 100