From 7578e86ef8ddb78da44d426b94def77366627e0e Mon Sep 17 00:00:00 2001 From: smitsohu Date: Wed, 9 Feb 2022 18:04:36 +0100 Subject: 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. --- test/network/4bridges_arp.exp | 10 +++++----- test/network/4bridges_ip.exp | 10 +++++----- test/network/bandwidth.exp | 2 +- test/network/dns-print.exp | 2 +- test/network/firemon-arp.exp | 4 ++-- test/network/firemon-interfaces.exp | 4 ++-- test/network/firemon-route.exp | 4 ++-- test/network/hostname.exp | 2 +- test/network/interface.exp | 2 +- test/network/ip6.exp | 6 +++--- test/network/iprange.exp | 4 ++-- test/network/net_arp.exp | 10 +++++----- test/network/net_defaultgw.exp | 2 +- test/network/net_defaultgw2.exp | 2 +- test/network/net_ip.exp | 4 ++-- test/network/net_local.exp | 4 ++-- test/network/net_mac.exp | 2 +- test/network/net_macvlan2.exp | 2 +- test/network/net_mtu.exp | 2 +- test/network/net_netfilter.exp | 8 ++++---- test/network/net_noip.exp | 2 +- test/network/net_noip2.exp | 2 +- test/network/net_none.exp | 4 ++-- test/network/net_profile.exp | 2 +- test/network/net_scan.exp | 6 +++--- test/network/net_unconfigured.exp | 10 +++++----- test/network/net_veth.exp | 4 ++-- test/network/netfilter-template.exp | 2 +- test/network/netns.exp | 2 +- test/network/netstats.exp | 4 ++-- test/network/veth-name.exp | 4 ++-- 31 files changed, 64 insertions(+), 64 deletions(-) (limited to 'test/network') diff --git a/test/network/4bridges_arp.exp b/test/network/4bridges_arp.exp index ccf6050fc..b7138851a 100755 --- a/test/network/4bridges_arp.exp +++ b/test/network/4bridges_arp.exp @@ -27,7 +27,7 @@ expect { } expect { timeout {puts "TESTING ERROR 0.4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "exit\r" @@ -53,7 +53,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1.4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "exit\r" @@ -80,7 +80,7 @@ expect { } expect { timeout {puts "TESTING ERROR 2.4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "exit\r" @@ -108,7 +108,7 @@ expect { } expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "exit\r" @@ -137,7 +137,7 @@ expect { } expect { timeout {puts "TESTING ERROR 9\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/network/4bridges_ip.exp b/test/network/4bridges_ip.exp index af47391ef..60e9d3bab 100755 --- a/test/network/4bridges_ip.exp +++ b/test/network/4bridges_ip.exp @@ -27,7 +27,7 @@ expect { } expect { timeout {puts "TESTING ERROR 0.4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "exit\r" @@ -53,7 +53,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1.4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "exit\r" @@ -80,7 +80,7 @@ expect { } expect { timeout {puts "TESTING ERROR 2.4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "exit\r" @@ -108,7 +108,7 @@ expect { } expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "exit\r" @@ -137,7 +137,7 @@ expect { } expect { timeout {puts "TESTING ERROR 9\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } # check default gateway diff --git a/test/network/bandwidth.exp b/test/network/bandwidth.exp index 6b85aa07f..1a27bc0bf 100755 --- a/test/network/bandwidth.exp +++ b/test/network/bandwidth.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --name=test --net=br0\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/network/dns-print.exp b/test/network/dns-print.exp index 760e9c252..fd19b79ed 100755 --- a/test/network/dns-print.exp +++ b/test/network/dns-print.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --name=test-dns --net=eth0 --dns=1.2.3.4 --dns=2.3.4.5 --dns=3.4.5.6\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/network/firemon-arp.exp b/test/network/firemon-arp.exp index 5caa4e8bd..0e98b9f36 100755 --- a/test/network/firemon-arp.exp +++ b/test/network/firemon-arp.exp @@ -17,7 +17,7 @@ match_max 100000 send -- "firejail --name=test1\r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -25,7 +25,7 @@ spawn $env(SHELL) send -- "firejail --name=test2\r" expect { timeout {puts "TESTING ERROR 2\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/network/firemon-interfaces.exp b/test/network/firemon-interfaces.exp index f49e4c470..8eb9f4d87 100755 --- a/test/network/firemon-interfaces.exp +++ b/test/network/firemon-interfaces.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --net=eth0 --name=test1\r" expect { timeout {puts "TESTING ERROR 9\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 --net=eth0 --name=test2\r" expect { timeout {puts "TESTING ERROR 9\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/network/firemon-route.exp b/test/network/firemon-route.exp index a3af6b2c6..4eea5c14c 100755 --- a/test/network/firemon-route.exp +++ b/test/network/firemon-route.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --name=test1\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\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/network/hostname.exp b/test/network/hostname.exp index 3fe684a75..12266a170 100755 --- a/test/network/hostname.exp +++ b/test/network/hostname.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --hostname=bingo --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 send -- "stty -echo\r" diff --git a/test/network/interface.exp b/test/network/interface.exp index 4ae5b1da6..7c3e39fea 100755 --- a/test/network/interface.exp +++ b/test/network/interface.exp @@ -20,7 +20,7 @@ set chroot [lindex $argv 1] send -- "firejail --noprofile --interface=eth0.5 --interface=eth0.6\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/network/ip6.exp b/test/network/ip6.exp index ddc50754f..665081db7 100755 --- a/test/network/ip6.exp +++ b/test/network/ip6.exp @@ -23,7 +23,7 @@ expect { } expect { timeout {puts "TESTING ERROR 3\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 @@ -64,7 +64,7 @@ expect { } expect { timeout {puts "TESTING ERROR 13\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 @@ -90,7 +90,7 @@ send -- "firejail --debug --netfilter6=ipv6.net\r" expect { timeout {puts "TESTING ERROR 11\n";exit} "Installing IPv6 firewall" {puts "TESTING ERROR 12\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 send -- "exit\r" diff --git a/test/network/iprange.exp b/test/network/iprange.exp index cfb1f25c7..d45ecaa40 100755 --- a/test/network/iprange.exp +++ b/test/network/iprange.exp @@ -27,7 +27,7 @@ expect { } expect { timeout {puts "TESTING ERROR 3\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 send -- "exit\r" @@ -53,7 +53,7 @@ expect { } expect { timeout {puts "TESTING ERROR 8\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 send -- "exit\r" diff --git a/test/network/net_arp.exp b/test/network/net_arp.exp index 4c4e893b1..dee4ac1c1 100755 --- a/test/network/net_arp.exp +++ b/test/network/net_arp.exp @@ -10,27 +10,27 @@ match_max 100000 send -- "firejail --net=br0 sleep 20 &\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } send -- "firejail --net=br0 sleep 20 &\r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } send -- "firejail --net=br0 sleep 20 &\r" expect { timeout {puts "TESTING ERROR 2\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } send -- "firejail --net=br0 sleep 20 &\r" expect { timeout {puts "TESTING ERROR 3\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } send -- "firejail --net=br0 sleep 20 &\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } # will fail diff --git a/test/network/net_defaultgw.exp b/test/network/net_defaultgw.exp index e154daccf..6a5a0b64e 100755 --- a/test/network/net_defaultgw.exp +++ b/test/network/net_defaultgw.exp @@ -27,7 +27,7 @@ expect { } expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/network/net_defaultgw2.exp b/test/network/net_defaultgw2.exp index c32549d63..5d18571b6 100755 --- a/test/network/net_defaultgw2.exp +++ b/test/network/net_defaultgw2.exp @@ -15,7 +15,7 @@ expect { } expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/network/net_ip.exp b/test/network/net_ip.exp index 604791f69..bdac67155 100755 --- a/test/network/net_ip.exp +++ b/test/network/net_ip.exp @@ -27,7 +27,7 @@ expect { } expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "exit\r" @@ -53,7 +53,7 @@ expect { } expect { timeout {puts "TESTING ERROR 9\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/network/net_local.exp b/test/network/net_local.exp index 54e821a90..6d02de089 100755 --- a/test/network/net_local.exp +++ b/test/network/net_local.exp @@ -15,7 +15,7 @@ expect { } expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "exit\r" @@ -25,7 +25,7 @@ sleep 1 send -- "firejail --noprofile\r" expect { timeout {puts "TESTING ERROR 9\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/network/net_mac.exp b/test/network/net_mac.exp index 05400a761..3bd871a06 100755 --- a/test/network/net_mac.exp +++ b/test/network/net_mac.exp @@ -31,7 +31,7 @@ expect { } expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } send -- "exit\r" after 100 diff --git a/test/network/net_macvlan2.exp b/test/network/net_macvlan2.exp index 9be0a8580..abc6641bf 100755 --- a/test/network/net_macvlan2.exp +++ b/test/network/net_macvlan2.exp @@ -30,7 +30,7 @@ expect { } expect { timeout {puts "TESTING ERROR 0.6\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 send -- "exit\r" diff --git a/test/network/net_mtu.exp b/test/network/net_mtu.exp index 254207a4e..81c89e147 100755 --- a/test/network/net_mtu.exp +++ b/test/network/net_mtu.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --net=br0 --mtu=1000 --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/network/net_netfilter.exp b/test/network/net_netfilter.exp index 65865122a..eef4a145f 100755 --- a/test/network/net_netfilter.exp +++ b/test/network/net_netfilter.exp @@ -27,7 +27,7 @@ expect { } expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "exit\r" @@ -41,7 +41,7 @@ expect { "Chain INPUT (policy DROP" {puts "TESTING ERROR 5.1\n";exit} "ACCEPT all -- any any anywhere" {puts "TESTING ERROR 5.1\n";exit} "ACCEPT icmp -- any any anywhere" {puts "TESTING ERROR 5.1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "exit\r" @@ -55,7 +55,7 @@ expect { } expect { timeout {puts "TESTING ERROR 6.1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "ping -c 1 -w 3 10.10.20.1\r" @@ -75,7 +75,7 @@ expect { } expect { timeout {puts "TESTING ERROR 7.1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 send -- "ping -c 1 -w 3 10.10.20.1\r" diff --git a/test/network/net_noip.exp b/test/network/net_noip.exp index 37211d923..11d12c3d3 100755 --- a/test/network/net_noip.exp +++ b/test/network/net_noip.exp @@ -12,7 +12,7 @@ send -- "firejail --noprofile --net=br0 --ip=none\r" expect { timeout {puts "TESTING ERROR 0\n";exit} "eth0" {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "bash\r" diff --git a/test/network/net_noip2.exp b/test/network/net_noip2.exp index ebba23e81..09607d4b5 100755 --- a/test/network/net_noip2.exp +++ b/test/network/net_noip2.exp @@ -12,7 +12,7 @@ send -- "firejail --noprofile --net=br1 --ip=none --defaultgw=10.10.30.78\r" expect { timeout {puts "TESTING ERROR 0\n";exit} "eth0" {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "bash\r" diff --git a/test/network/net_none.exp b/test/network/net_none.exp index 95b1cf086..32d7532ce 100755 --- a/test/network/net_none.exp +++ b/test/network/net_none.exp @@ -12,7 +12,7 @@ send -- "firejail --net=none\r" expect { timeout {puts "TESTING ERROR 0\n";exit} "eth0" {puts "TESTING ERROR 0.1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -47,7 +47,7 @@ send -- "firejail --profile=net_none.profile\r" expect { timeout {puts "TESTING ERROR 3\n";exit} "eth0" {puts "TESTING ERROR 3.1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/network/net_profile.exp b/test/network/net_profile.exp index 236603ff1..3d6f8fdbb 100755 --- a/test/network/net_profile.exp +++ b/test/network/net_profile.exp @@ -31,7 +31,7 @@ expect { } expect { timeout {puts "TESTING ERROR 0.4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/network/net_scan.exp b/test/network/net_scan.exp index 90e2e6b9d..42dd74df0 100755 --- a/test/network/net_scan.exp +++ b/test/network/net_scan.exp @@ -23,7 +23,7 @@ expect { } expect { timeout {puts "TESTING ERROR 3\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -43,7 +43,7 @@ expect { } expect { timeout {puts "TESTING ERROR 7\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -63,7 +63,7 @@ expect { } expect { timeout {puts "TESTING ERROR 11\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/network/net_unconfigured.exp b/test/network/net_unconfigured.exp index 434edaea3..92d7a33eb 100755 --- a/test/network/net_unconfigured.exp +++ b/test/network/net_unconfigured.exp @@ -12,7 +12,7 @@ send -- "firejail --noprofile --net=br-unconfigured --ip=none\r" expect { timeout {puts "TESTING ERROR 0\n";exit} "eth0" {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "bash\r" @@ -53,7 +53,7 @@ send -- "firejail --noprofile --net=br-unconfigured\r" expect { timeout {puts "TESTING ERROR 7\n";exit} "eth0" {puts "TESTING ERROR 8\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "bash\r" @@ -93,7 +93,7 @@ send -- "firejail --noprofile --net=br-unconfigured --defaultgw=10.10.80.1\r" expect { timeout {puts "TESTING ERROR 14\n";exit} "eth0" {puts "TESTING ERROR 15\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "bash\r" @@ -133,7 +133,7 @@ send -- "firejail --noprofile --net=br-unconfigured --ip=10.10.80.1 --defaultgw= expect { timeout {puts "TESTING ERROR 21\n";exit} "eth0" {puts "TESTING ERROR 22\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "bash\r" @@ -180,7 +180,7 @@ expect { } expect { timeout {puts "TESTING ERROR 30\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "bash\r" diff --git a/test/network/net_veth.exp b/test/network/net_veth.exp index 22388ed89..781cc194c 100755 --- a/test/network/net_veth.exp +++ b/test/network/net_veth.exp @@ -42,7 +42,7 @@ expect { } expect { timeout {puts "TESTING ERROR 9\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "exit\r" @@ -119,7 +119,7 @@ expect { } expect { timeout {puts "TESTING ERROR 27\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "exit\r" diff --git a/test/network/netfilter-template.exp b/test/network/netfilter-template.exp index f77e4f025..ba09aaea7 100755 --- a/test/network/netfilter-template.exp +++ b/test/network/netfilter-template.exp @@ -18,7 +18,7 @@ sleep 1 send -- "firejail --net=br1 --ip=10.10.30.10 --name=test1 --netfilter=/etc/firejail/tcpserver.net,5555 ./tcpserver 5555\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/network/netns.exp b/test/network/netns.exp index f33e5f3c0..034f4736e 100755 --- a/test/network/netns.exp +++ b/test/network/netns.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --netns=red --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 diff --git a/test/network/netstats.exp b/test/network/netstats.exp index b07fbd535..e06e6769d 100755 --- a/test/network/netstats.exp +++ b/test/network/netstats.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --net=eth0 --name=test1\r" expect { timeout {puts "TESTING ERROR 9\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 --net=eth0 --name=test2\r" expect { timeout {puts "TESTING ERROR 9\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/network/veth-name.exp b/test/network/veth-name.exp index 1be6a15ea..1c9f23c54 100755 --- a/test/network/veth-name.exp +++ b/test/network/veth-name.exp @@ -23,7 +23,7 @@ expect { } expect { timeout {puts "TESTING ERROR 3\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -55,7 +55,7 @@ expect { } expect { timeout {puts "TESTING ERROR 9\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 -- cgit v1.2.3-70-g09d2