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, 12 insertions, 12 deletions

diff --git a/test/utils/name.exp b/test/utils/name.exp
index ade119183..cd4465d41 100755
--- a/test/utils/name.exp
+++ b/test/utils/name.exp
@@ -11,7 +11,7 @@ match_max 100000
 send -- "firejail --name=ftest\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
 
@@ -19,7 +19,7 @@ spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
 
@@ -27,7 +27,7 @@ spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
 
@@ -35,7 +35,7 @@ spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
 
@@ -43,7 +43,7 @@ spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
 
@@ -51,7 +51,7 @@ spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
 
@@ -59,7 +59,7 @@ spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
         timeout {puts "TESTING ERROR 6\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
 
@@ -67,7 +67,7 @@ spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
         timeout {puts "TESTING ERROR 7\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
 
@@ -75,7 +75,7 @@ spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
         timeout {puts "TESTING ERROR 8\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
 
@@ -83,7 +83,7 @@ spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
         timeout {puts "TESTING ERROR 9\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
 
@@ -91,7 +91,7 @@ spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
         timeout {puts "TESTING ERROR 10\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100
 
@@ -99,7 +99,7 @@ spawn $env(SHELL)
 send -- "firejail --name=ftest\r"
 expect {
         timeout {puts "TESTING ERROR 11\n";exit}
-        "Child process initialized"
+        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
 }
 after 100