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.

16 files changed, 42 insertions, 42 deletions

diff --git a/test/filters/apparmor.exp b/test/filters/apparmor.exp
index c7e793ca3..13ce4dd06 100755
--- a/test/filters/apparmor.exp
+++ b/test/filters/apparmor.exp
@@ -10,7 +10,7 @@ match_max 100000
 send --  "firejail --name=test1 --apparmor\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 
@@ -18,7 +18,7 @@ spawn $env(SHELL)
 send --  "firejail --name=test2 --apparmor\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 
diff --git a/test/filters/caps-join.exp b/test/filters/caps-join.exp
index e9b5f59d0..921d6b695 100755
--- a/test/filters/caps-join.exp
+++ b/test/filters/caps-join.exp
@@ -20,7 +20,7 @@ set spawn_id $id1
 send --  "firejail --name=jointesting\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 
@@ -44,7 +44,7 @@ set spawn_id $id1
 send --  "firejail --name=jointesting --noprofile\r"
 expect {
         timeout {puts "TESTING ERROR 10\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 
@@ -76,7 +76,7 @@ set spawn_id $id1
 send --  "firejail --name=jointesting --noprofile --caps.keep=chown,fowner\r"
 expect {
         timeout {puts "TESTING ERROR20\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 
diff --git a/test/filters/caps-print.exp b/test/filters/caps-print.exp
index 8c51bb796..f4f2fc7ca 100755
--- a/test/filters/caps-print.exp
+++ b/test/filters/caps-print.exp
@@ -42,7 +42,7 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 8\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 
diff --git a/test/filters/caps.exp b/test/filters/caps.exp
index c29794ea3..29437beea 100755
--- a/test/filters/caps.exp
+++ b/test/filters/caps.exp
@@ -10,7 +10,7 @@ match_max 100000
 send -- "firejail --caps.keep=chown,fowner --noprofile\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
 
@@ -29,7 +29,7 @@ sleep 1
 send -- "firejail --caps.drop=all --noprofile\r"
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
 
@@ -48,7 +48,7 @@ sleep 1
 send -- "firejail --caps.drop=chown,dac_override,dac_read_search,fowner --noprofile\r"
 expect {
         timeout {puts "TESTING ERROR 7\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
 
@@ -81,7 +81,7 @@ expect {
 expect {
         timeout {puts "TESTING ERROR 13\n";exit}
         "Drop CAP_" {puts "TESTING ERROR 14\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
 send -- "exit\r"
@@ -93,7 +93,7 @@ sleep 1
 #send -- "firejail --profile=caps2.profile\r"
 #expect {
 #       timeout {puts "TESTING ERROR 15\n";exit}
-#       "Child process initialized"
+#       -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 #}
 #after 100
 #
@@ -113,7 +113,7 @@ sleep 1
 send -- "firejail --profile=caps3.profile\r"
 expect {
         timeout {puts "TESTING ERROR 18\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
 
diff --git a/test/filters/memwrexe-32.exp b/test/filters/memwrexe-32.exp
index f7b59f43f..211052514 100755
--- a/test/filters/memwrexe-32.exp
+++ b/test/filters/memwrexe-32.exp
@@ -10,7 +10,7 @@ match_max 100000
 send --  "firejail --memory-deny-write-execute ./memwrexe-32 mmap\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
@@ -22,7 +22,7 @@ after 100
 send --  "firejail --memory-deny-write-execute ./memwrexe-32 mprotect\r"
 expect {
         timeout {puts "TESTING ERROR 10\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 expect {
         timeout {puts "TESTING ERROR 11\n";exit}
@@ -34,7 +34,7 @@ after 100
 send --  "firejail --memory-deny-write-execute ./memwrexe-32 memfd_create\r"
 expect {
         timeout {puts "TESTING ERROR 20\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 expect {
         timeout {puts "TESTING ERROR 21\n";exit}
diff --git a/test/filters/memwrexe.exp b/test/filters/memwrexe.exp
index 9d08509e9..950acbf50 100755
--- a/test/filters/memwrexe.exp
+++ b/test/filters/memwrexe.exp
@@ -10,7 +10,7 @@ match_max 100000
 send --  "firejail --memory-deny-write-execute ./memwrexe mmap\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
@@ -22,7 +22,7 @@ after 100
 send --  "firejail --memory-deny-write-execute ./memwrexe mprotect\r"
 expect {
         timeout {puts "TESTING ERROR 10\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 expect {
         timeout {puts "TESTING ERROR 11\n";exit}
@@ -34,7 +34,7 @@ after 100
 send --  "firejail --memory-deny-write-execute ./memwrexe memfd_create\r"
 expect {
         timeout {puts "TESTING ERROR 20\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 expect {
         timeout {puts "TESTING ERROR 21\n";exit}
diff --git a/test/filters/noroot.exp b/test/filters/noroot.exp
index 504b17239..66e1e4e27 100755
--- a/test/filters/noroot.exp
+++ b/test/filters/noroot.exp
@@ -10,7 +10,7 @@ match_max 100000
 send -- "firejail --name=test --noroot --noprofile\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 
diff --git a/test/filters/seccomp-chmod-profile.exp b/test/filters/seccomp-chmod-profile.exp
index c754b48fa..ac16015cd 100755
--- a/test/filters/seccomp-chmod-profile.exp
+++ b/test/filters/seccomp-chmod-profile.exp
@@ -10,7 +10,7 @@ match_max 100000
 send --  "firejail --profile=seccomp.profile --private\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 
diff --git a/test/filters/seccomp-chmod.exp b/test/filters/seccomp-chmod.exp
index 39baa5533..913ea18a7 100755
--- a/test/filters/seccomp-chmod.exp
+++ b/test/filters/seccomp-chmod.exp
@@ -10,7 +10,7 @@ match_max 100000
 send --  "firejail --seccomp=chmod,fchmod,fchmodat --private\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 
diff --git a/test/filters/seccomp-chown.exp b/test/filters/seccomp-chown.exp
index 553f164b1..be6c13e2d 100755
--- a/test/filters/seccomp-chown.exp
+++ b/test/filters/seccomp-chown.exp
@@ -10,7 +10,7 @@ match_max 100000
 send --  "firejail --seccomp=chown,fchown,fchownat,lchown --private\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 2
 
diff --git a/test/filters/seccomp-debug-32.exp b/test/filters/seccomp-debug-32.exp
index a2f99c1ca..71d653c1f 100755
--- a/test/filters/seccomp-debug-32.exp
+++ b/test/filters/seccomp-debug-32.exp
@@ -21,7 +21,7 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
@@ -36,7 +36,7 @@ expect {
         timeout {puts "TESTING ERROR 10\n";exit}
         "Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" {puts "TESTING ERROR 11\n";exit}
         "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 12\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 expect {
         timeout {puts "TESTING ERROR 16\n";exit}
@@ -48,7 +48,7 @@ after 100
 send --  "firejail --debug --ignore=protocol sleep 1; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 17\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 expect {
         timeout {puts "TESTING ERROR 19\n";exit}
@@ -65,7 +65,7 @@ after 100
 send --  "firejail --debug --memory-deny-write-execute sleep 1; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 24\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 expect {
         timeout {puts "TESTING ERROR 25\n";exit}
@@ -82,7 +82,7 @@ send --  "firejail --debug --seccomp.block-secondary sleep 1; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 27\n";exit}
         "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 28\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 expect {
         timeout {puts "TESTING ERROR 29\n";exit}
@@ -105,7 +105,7 @@ send --  "firejail --debug --profile=block-secondary.profile sleep 1; echo done\
 expect {
         timeout {puts "TESTING ERROR 33\n";exit}
         "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 34\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 expect {
         timeout {puts "TESTING ERROR 35\n";exit}
diff --git a/test/filters/seccomp-debug.exp b/test/filters/seccomp-debug.exp
index d2413697d..b4a9e158d 100755
--- a/test/filters/seccomp-debug.exp
+++ b/test/filters/seccomp-debug.exp
@@ -21,7 +21,7 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
@@ -34,7 +34,7 @@ after 100
 send --  "firejail --debug sleep 1; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 expect {
         timeout {puts "TESTING ERROR 6\n";exit}
@@ -60,7 +60,7 @@ expect {
         timeout {puts "TESTING ERROR 10\n";exit}
         "Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" {puts "TESTING ERROR 11\n";exit}
         "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 12\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 expect {
         timeout {puts "TESTING ERROR 13\n";exit}
@@ -79,7 +79,7 @@ send --  "firejail --debug --ignore=protocol sleep 1; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 17\n";exit}
         "Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" {puts "TESTING ERROR 18\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 expect {
         timeout {puts "TESTING ERROR 19\n";exit}
@@ -101,7 +101,7 @@ after 100
 send --  "firejail --debug --memory-deny-write-execute sleep 1; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 24\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 expect {
         timeout {puts "TESTING ERROR 25\n";exit}
@@ -118,7 +118,7 @@ send --  "firejail --debug --seccomp.block-secondary sleep 1; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 27\n";exit}
         "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 28\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 expect {
         timeout {puts "TESTING ERROR 29\n";exit}
@@ -141,7 +141,7 @@ send --  "firejail --debug --profile=block-secondary.profile sleep 1; echo done\
 expect {
         timeout {puts "TESTING ERROR 33\n";exit}
         "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 34\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 expect {
         timeout {puts "TESTING ERROR 35\n";exit}
diff --git a/test/filters/seccomp-empty.exp b/test/filters/seccomp-empty.exp
index 79944b1ba..7a5597727 100755
--- a/test/filters/seccomp-empty.exp
+++ b/test/filters/seccomp-empty.exp
@@ -42,7 +42,7 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 0.7\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 2
 send -- "exit\r"
@@ -78,7 +78,7 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 1.7\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 2
 send -- "exit\r"
@@ -120,7 +120,7 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 2.7\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 2
 send -- "exit\r"
@@ -156,7 +156,7 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 3.7\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 2
 send -- "exit\r"
diff --git a/test/filters/seccomp-errno.exp b/test/filters/seccomp-errno.exp
index 3b6759a40..f5e9ff402 100755
--- a/test/filters/seccomp-errno.exp
+++ b/test/filters/seccomp-errno.exp
@@ -31,7 +31,7 @@ sleep 1
 send --  "firejail --seccomp=unlinkat:ENOENT,mkdir:ENOENT\r"
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 1
 send -- "rm seccomp-test-file\r"
diff --git a/test/filters/seccomp-ptrace.exp b/test/filters/seccomp-ptrace.exp
index c857527d6..9bde7355f 100755
--- a/test/filters/seccomp-ptrace.exp
+++ b/test/filters/seccomp-ptrace.exp
@@ -10,7 +10,7 @@ match_max 100000
 send --  "firejail --noprofile --seccomp\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 2
 
diff --git a/test/filters/seccomp-su.exp b/test/filters/seccomp-su.exp
index ddded4111..d204a4295 100755
--- a/test/filters/seccomp-su.exp
+++ b/test/filters/seccomp-su.exp
@@ -10,7 +10,7 @@ match_max 100000
 send --  "firejail --noprofile --seccomp\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 sleep 2