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/appimage/appimage-args.exp | 4 ++-- test/appimage/appimage-trace.exp | 4 ++-- test/appimage/appimage-v1.exp | 4 ++-- test/appimage/appimage-v2.exp | 4 ++-- test/apps-x11-xorg/firefox.exp | 2 +- test/apps-x11-xorg/thunderbird.exp | 2 +- test/apps-x11-xorg/transmission-gtk.exp | 2 +- test/apps-x11-xorg/transmission-qt.exp | 2 +- test/apps-x11/chromium.exp | 2 +- test/apps-x11/firefox.exp | 2 +- test/apps-x11/thunderbird.exp | 2 +- test/apps-x11/transmission-gtk.exp | 2 +- test/apps-x11/x11-none.exp | 2 +- test/apps-x11/x11-xephyr.exp | 4 ++-- test/apps-x11/xterm-xephyr.exp | 2 +- test/apps-x11/xterm-xorg.exp | 2 +- test/apps-x11/xterm-xpra.exp | 2 +- test/apps/chromium.exp | 4 ++-- test/apps/deluge.exp | 4 ++-- test/apps/fbreader.exp | 4 ++-- test/apps/filezilla.exp | 4 ++-- test/apps/firefox.exp | 4 ++-- test/apps/gnome-mplayer.exp | 4 ++-- test/apps/gthumb.exp | 4 ++-- test/apps/hexchat.exp | 4 ++-- test/apps/kcalc.exp | 4 ++-- test/apps/ktorrent.exp | 4 ++-- test/apps/midori.exp | 4 ++-- test/apps/opera.exp | 4 ++-- test/apps/qbittorrent.exp | 4 ++-- test/apps/thunderbird.exp | 4 ++-- test/apps/transmission-qt.exp | 4 ++-- test/apps/uget-gtk.exp | 4 ++-- test/apps/vlc.exp | 4 ++-- test/apps/wine.exp | 2 +- test/apps/xchat.exp | 4 ++-- test/chroot/fs_chroot.exp | 2 +- test/chroot/unchroot-as-root.exp | 2 +- test/environment/allow-debuggers.exp | 2 +- test/environment/csh.exp | 2 +- test/environment/dash.exp | 2 +- test/environment/deterministic-exit-code.exp | 4 ++-- test/environment/dns.exp | 8 ++++---- test/environment/doubledash.exp | 4 ++-- test/environment/env.exp | 4 ++-- test/environment/extract_command.exp | 2 +- test/environment/firejail-in-firejail.exp | 2 +- test/environment/hostfile.exp | 2 +- test/environment/ibus.exp | 2 +- test/environment/keep-fd.exp | 10 +++++----- test/environment/machineid.exp | 2 +- test/environment/nice.exp | 6 +++--- test/environment/rlimit-join.exp | 8 ++++++-- test/environment/rlimit-profile.exp | 2 +- test/environment/rlimit.exp | 2 +- test/environment/shell-none.exp | 4 ++-- test/environment/sound.exp | 10 +++++----- test/environment/timeout.exp | 2 +- test/environment/umask.exp | 2 +- test/environment/zsh.exp | 2 +- test/features/1.1.exp | 6 +++--- test/features/1.10.exp | 6 +++--- test/features/1.2.exp | 6 +++--- test/features/1.4.exp | 6 +++--- test/features/1.5.exp | 6 +++--- test/features/1.6.exp | 6 +++--- test/features/1.7.exp | 6 +++--- test/features/1.8.exp | 6 +++--- test/features/2.1.exp | 6 +++--- test/features/2.2.exp | 6 +++--- test/features/2.3.exp | 12 ++++++------ test/features/2.4.exp | 12 ++++++------ test/features/2.5.exp | 6 +++--- test/features/2.6.exp | 6 +++--- test/features/3.1.exp | 6 +++--- test/features/3.10.exp | 6 +++--- test/features/3.11.exp | 6 +++--- test/features/3.2.exp | 6 +++--- test/features/3.3.exp | 6 +++--- test/features/3.4.exp | 6 +++--- test/features/3.5.exp | 6 +++--- test/features/3.6.exp | 6 +++--- test/features/3.7.exp | 6 +++--- test/features/3.8.exp | 6 +++--- test/features/3.9.exp | 6 +++--- test/filters/apparmor.exp | 4 ++-- test/filters/caps-join.exp | 6 +++--- test/filters/caps-print.exp | 2 +- test/filters/caps.exp | 12 ++++++------ test/filters/memwrexe-32.exp | 6 +++--- test/filters/memwrexe.exp | 6 +++--- test/filters/noroot.exp | 2 +- test/filters/seccomp-chmod-profile.exp | 2 +- test/filters/seccomp-chmod.exp | 2 +- test/filters/seccomp-chown.exp | 2 +- test/filters/seccomp-debug-32.exp | 12 ++++++------ test/filters/seccomp-debug.exp | 14 +++++++------- test/filters/seccomp-empty.exp | 8 ++++---- test/filters/seccomp-errno.exp | 2 +- test/filters/seccomp-ptrace.exp | 2 +- test/filters/seccomp-su.exp | 2 +- test/fs/fs_dev_shm.exp | 4 ++-- test/fs/fs_var_lock.exp | 4 ++-- test/fs/fs_var_tmp.exp | 4 ++-- test/fs/fscheck-tmpfs.exp | 2 +- test/fs/kmsg.exp | 2 +- test/fs/macro.exp | 26 +++++++++++++------------- test/fs/mkdir_mkfile.exp | 2 +- test/fs/noblacklist-blacklist-noexec.exp | 2 +- test/fs/noblacklist-blacklist-readonly.exp | 2 +- test/fs/option_blacklist.exp | 2 +- test/fs/option_blacklist_file.exp | 2 +- test/fs/option_blacklist_glob.exp | 2 +- test/fs/private-bin.exp | 4 ++-- test/fs/private-cache.exp | 2 +- test/fs/private-etc-empty.exp | 4 ++-- test/fs/private-etc.exp | 2 +- test/fs/private-home-dir.exp | 4 ++-- test/fs/private-home.exp | 4 ++-- test/fs/private-homedir.exp | 2 +- test/fs/private-lib.exp | 2 +- test/fs/private-whitelist.exp | 2 +- test/fs/private.exp | 2 +- test/fs/read-write.exp | 2 +- test/fs/sys_fs.exp | 4 ++-- test/fs/whitelist-dev.exp | 12 ++++++------ test/fs/whitelist-double.exp | 2 +- test/fs/whitelist-empty.exp | 2 +- test/fs/whitelist-noexec.exp | 2 +- test/fs/whitelist-readonly.exp | 2 +- test/fs/whitelist-whitespace.exp | 2 +- test/fs/whitelist.exp | 6 +++--- 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 ++-- test/overlay/firefox-x11-xorg.exp | 2 +- test/overlay/firefox-x11.exp | 2 +- test/overlay/firefox.exp | 4 ++-- test/overlay/fs-named.exp | 4 ++-- test/overlay/fs-tmpfs.exp | 2 +- test/overlay/fs.exp | 2 +- test/private-lib/atril.exp | 4 ++-- test/private-lib/eog.exp | 4 ++-- test/private-lib/eom.exp | 4 ++-- test/private-lib/evince.exp | 4 ++-- test/private-lib/galculator.exp | 4 ++-- test/private-lib/gedit.exp | 4 ++-- test/private-lib/gnome-calculator.exp | 4 ++-- test/private-lib/gnome-logs.exp | 4 ++-- test/private-lib/gnome-nettool.exp | 4 ++-- test/private-lib/gnome-system-log.exp | 4 ++-- test/private-lib/gpicview.exp | 4 ++-- test/private-lib/leafpad.exp | 4 ++-- test/private-lib/mousepad.exp | 4 ++-- test/private-lib/pavucontrol.exp | 4 ++-- test/private-lib/pluma.exp | 4 ++-- test/private-lib/transmission-gtk.exp | 4 ++-- test/private-lib/xcalc.exp | 4 ++-- test/profiles/conditional.exp | 4 ++-- test/profiles/ignore.exp | 10 +++++----- test/profiles/profile_comment.exp | 4 ++-- test/profiles/profile_followlnk.exp | 2 +- test/profiles/profile_readonly.exp | 2 +- test/profiles/profile_syntax.exp | 2 +- test/root/apache2.exp | 2 +- test/root/cgroup.exp | 12 ++++++++---- test/root/firemon-events.exp | 2 +- test/root/isc-dhcp.exp | 2 +- test/root/join.exp | 18 +++++++++++------- test/root/login_nobody.exp | 2 +- test/root/nginx.exp | 2 +- test/root/option_bind_directory.exp | 2 +- test/root/option_bind_file.exp | 2 +- test/root/option_tmpfs.exp | 2 +- test/root/private.exp | 10 +++++----- test/root/profile_tmpfs.exp | 2 +- test/root/seccomp-chmod.exp | 2 +- test/root/seccomp-chown.exp | 2 +- test/root/seccomp-umount.exp | 2 +- test/root/snmpd.exp | 2 +- test/root/unbound.exp | 2 +- test/root/whitelist.exp | 10 +++++----- test/ssh/login.exp | 2 +- test/ssh/scp.exp | 4 ++-- test/ssh/sftp.exp | 4 ++-- test/stress/blacklist.exp | 4 ++-- test/stress/env.exp | 2 +- test/stress/net_macvlan.exp | 4 ++-- test/utils/caps-print.exp | 2 +- test/utils/cpu-print.exp | 4 ++-- test/utils/dns-print.exp | 2 +- test/utils/firemon-caps.exp | 14 +++++++------- test/utils/firemon-cgroup.exp | 4 ++-- test/utils/firemon-cpu.exp | 4 ++-- test/utils/firemon-name.exp | 2 +- test/utils/firemon-seccomp.exp | 4 ++-- test/utils/fs-print.exp | 2 +- test/utils/join-profile.exp | 10 +++++++--- test/utils/join.exp | 16 ++++++++++------ test/utils/join2.exp | 10 +++++++--- test/utils/join3.exp | 10 +++++++--- test/utils/join4.exp | 10 +++++++--- test/utils/join5.exp | 16 ++++++++++------ test/utils/list.exp | 6 +++--- test/utils/ls.exp | 2 +- test/utils/name.exp | 24 ++++++++++++------------ test/utils/profile_print.exp | 2 +- test/utils/protocol-print.exp | 2 +- test/utils/seccomp-print.exp | 2 +- test/utils/shutdown.exp | 2 +- test/utils/shutdown2.exp | 2 +- test/utils/shutdown3.exp | 2 +- test/utils/shutdown4.exp | 2 +- test/utils/top.exp | 4 ++-- test/utils/trace.exp | 14 +++++++------- test/utils/tree.exp | 6 +++--- 244 files changed, 559 insertions(+), 523 deletions(-) diff --git a/test/appimage/appimage-args.exp b/test/appimage/appimage-args.exp index a65197a52..e1fb8567a 100755 --- a/test/appimage/appimage-args.exp +++ b/test/appimage/appimage-args.exp @@ -23,7 +23,7 @@ expect { } expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 @@ -51,7 +51,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 7\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/appimage/appimage-trace.exp b/test/appimage/appimage-trace.exp index dfd2aaf9b..d1530349e 100755 --- a/test/appimage/appimage-trace.exp +++ b/test/appimage/appimage-trace.exp @@ -11,7 +11,7 @@ set appimage_id $spawn_id send -- "firejail --trace --timeout=00:00:05 --appimage Leafpad-0.8.17-x86_64.AppImage\r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 2\n";exit} @@ -38,7 +38,7 @@ sleep 1 send -- "firejail --trace --timeout=00:00:05 --appimage Leafpad-0.8.18.1.glibc2.4-x86_64.AppImage\r" expect { timeout {puts "TESTING ERROR 11\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 12\n";exit} diff --git a/test/appimage/appimage-v1.exp b/test/appimage/appimage-v1.exp index 0fc4ad0f0..2fcccfd5b 100755 --- a/test/appimage/appimage-v1.exp +++ b/test/appimage/appimage-v1.exp @@ -11,7 +11,7 @@ set appimage_id $spawn_id send -- "firejail --name=appimage-test --debug --appimage Leafpad-0.8.17-x86_64.AppImage\r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 @@ -39,7 +39,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/appimage/appimage-v2.exp b/test/appimage/appimage-v2.exp index 8f61de6e9..d289165d9 100755 --- a/test/appimage/appimage-v2.exp +++ b/test/appimage/appimage-v2.exp @@ -11,7 +11,7 @@ set appimage_id $spawn_id send -- "firejail --name=appimage-test --appimage Leafpad-0.8.18.1.glibc2.4-x86_64.AppImage\r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 @@ -39,7 +39,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps-x11-xorg/firefox.exp b/test/apps-x11-xorg/firefox.exp index 23c5d4675..4a85b593b 100755 --- a/test/apps-x11-xorg/firefox.exp +++ b/test/apps-x11-xorg/firefox.exp @@ -36,7 +36,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps-x11-xorg/thunderbird.exp b/test/apps-x11-xorg/thunderbird.exp index ede339cbe..a06303fc5 100755 --- a/test/apps-x11-xorg/thunderbird.exp +++ b/test/apps-x11-xorg/thunderbird.exp @@ -33,7 +33,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps-x11-xorg/transmission-gtk.exp b/test/apps-x11-xorg/transmission-gtk.exp index 0b7d87b07..3e497f9e0 100755 --- a/test/apps-x11-xorg/transmission-gtk.exp +++ b/test/apps-x11-xorg/transmission-gtk.exp @@ -33,7 +33,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps-x11-xorg/transmission-qt.exp b/test/apps-x11-xorg/transmission-qt.exp index ef036b569..0642d3d32 100755 --- a/test/apps-x11-xorg/transmission-qt.exp +++ b/test/apps-x11-xorg/transmission-qt.exp @@ -33,7 +33,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps-x11/chromium.exp b/test/apps-x11/chromium.exp index 227ce66a1..059fd0ad7 100755 --- a/test/apps-x11/chromium.exp +++ b/test/apps-x11/chromium.exp @@ -32,7 +32,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps-x11/firefox.exp b/test/apps-x11/firefox.exp index 7861187ed..ac177211d 100755 --- a/test/apps-x11/firefox.exp +++ b/test/apps-x11/firefox.exp @@ -36,7 +36,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps-x11/thunderbird.exp b/test/apps-x11/thunderbird.exp index d9c4ca396..391dc52e3 100755 --- a/test/apps-x11/thunderbird.exp +++ b/test/apps-x11/thunderbird.exp @@ -33,7 +33,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps-x11/transmission-gtk.exp b/test/apps-x11/transmission-gtk.exp index a87b76582..21bc4a8bc 100755 --- a/test/apps-x11/transmission-gtk.exp +++ b/test/apps-x11/transmission-gtk.exp @@ -33,7 +33,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps-x11/x11-none.exp b/test/apps-x11/x11-none.exp index d2cc69c98..e6ff12f27 100755 --- a/test/apps-x11/x11-none.exp +++ b/test/apps-x11/x11-none.exp @@ -17,7 +17,7 @@ sleep 1 send -- "firejail --name=test --net=none --x11=none\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/apps-x11/x11-xephyr.exp b/test/apps-x11/x11-xephyr.exp index e3c5f2742..f0090d713 100755 --- a/test/apps-x11/x11-xephyr.exp +++ b/test/apps-x11/x11-xephyr.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --name=test --x11=xephyr xterm\r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } exit @@ -28,7 +28,7 @@ sleep 1 send -- "firejail --name=test --net=none --x11=none\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/apps-x11/xterm-xephyr.exp b/test/apps-x11/xterm-xephyr.exp index 0e2bc8fc4..3db6cf793 100755 --- a/test/apps-x11/xterm-xephyr.exp +++ b/test/apps-x11/xterm-xephyr.exp @@ -33,7 +33,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps-x11/xterm-xorg.exp b/test/apps-x11/xterm-xorg.exp index 269ab35bf..409b39f40 100755 --- a/test/apps-x11/xterm-xorg.exp +++ b/test/apps-x11/xterm-xorg.exp @@ -33,7 +33,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps-x11/xterm-xpra.exp b/test/apps-x11/xterm-xpra.exp index 187d408f4..4acf780ac 100755 --- a/test/apps-x11/xterm-xpra.exp +++ b/test/apps-x11/xterm-xpra.exp @@ -33,7 +33,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps/chromium.exp b/test/apps/chromium.exp index 0248f9d88..4e036dee9 100755 --- a/test/apps/chromium.exp +++ b/test/apps/chromium.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 10 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps/deluge.exp b/test/apps/deluge.exp index efe964b75..5df35fce4 100755 --- a/test/apps/deluge.exp +++ b/test/apps/deluge.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 10 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps/fbreader.exp b/test/apps/fbreader.exp index 1d5c6df79..ebb21bcf2 100755 --- a/test/apps/fbreader.exp +++ b/test/apps/fbreader.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps/filezilla.exp b/test/apps/filezilla.exp index b1397278c..397904860 100755 --- a/test/apps/filezilla.exp +++ b/test/apps/filezilla.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps/firefox.exp b/test/apps/firefox.exp index 706e97e18..f09c76b5d 100755 --- a/test/apps/firefox.exp +++ b/test/apps/firefox.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 10 @@ -47,7 +47,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps/gnome-mplayer.exp b/test/apps/gnome-mplayer.exp index 64530e957..4d7ccff81 100755 --- a/test/apps/gnome-mplayer.exp +++ b/test/apps/gnome-mplayer.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 5 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps/gthumb.exp b/test/apps/gthumb.exp index 4a381677f..0da1572b2 100755 --- a/test/apps/gthumb.exp +++ b/test/apps/gthumb.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps/hexchat.exp b/test/apps/hexchat.exp index 20d8dbd0f..8ed823dd5 100755 --- a/test/apps/hexchat.exp +++ b/test/apps/hexchat.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps/kcalc.exp b/test/apps/kcalc.exp index 6c2769b8f..d7251eec1 100755 --- a/test/apps/kcalc.exp +++ b/test/apps/kcalc.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps/ktorrent.exp b/test/apps/ktorrent.exp index 98f51dcd5..efa3f1d08 100755 --- a/test/apps/ktorrent.exp +++ b/test/apps/ktorrent.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps/midori.exp b/test/apps/midori.exp index 1c6ac59a2..431b43f8d 100755 --- a/test/apps/midori.exp +++ b/test/apps/midori.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 5 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps/opera.exp b/test/apps/opera.exp index 40520f9f5..b0d1f3b9d 100755 --- a/test/apps/opera.exp +++ b/test/apps/opera.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 10 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps/qbittorrent.exp b/test/apps/qbittorrent.exp index 32d35997b..842e47986 100755 --- a/test/apps/qbittorrent.exp +++ b/test/apps/qbittorrent.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps/thunderbird.exp b/test/apps/thunderbird.exp index ba7b3abee..2b93835b6 100755 --- a/test/apps/thunderbird.exp +++ b/test/apps/thunderbird.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 5 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps/transmission-qt.exp b/test/apps/transmission-qt.exp index 18bd6c469..90b0ef4ac 100755 --- a/test/apps/transmission-qt.exp +++ b/test/apps/transmission-qt.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps/uget-gtk.exp b/test/apps/uget-gtk.exp index 6ba56d193..21b859ee2 100755 --- a/test/apps/uget-gtk.exp +++ b/test/apps/uget-gtk.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps/vlc.exp b/test/apps/vlc.exp index 6114c2ee4..a0aed9cc9 100755 --- a/test/apps/vlc.exp +++ b/test/apps/vlc.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps/wine.exp b/test/apps/wine.exp index 58f2adcb6..e2a08089f 100755 --- a/test/apps/wine.exp +++ b/test/apps/wine.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 2\n";exit} diff --git a/test/apps/xchat.exp b/test/apps/xchat.exp index f5e0b545b..ca17f44e4 100755 --- a/test/apps/xchat.exp +++ b/test/apps/xchat.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/chroot/fs_chroot.exp b/test/chroot/fs_chroot.exp index 86864bc5b..c379e389c 100755 --- a/test/chroot/fs_chroot.exp +++ b/test/chroot/fs_chroot.exp @@ -11,7 +11,7 @@ send -- "firejail --chroot=/tmp/chroot\r" expect { timeout {puts "TESTING ERROR 0\n";exit} "Error: --chroot option is not available on Grsecurity systems" {puts "\nall done\n"; exit} - "Child process initialized" {puts "chroot available\n"}; + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "chroot available\n"}; } sleep 1 diff --git a/test/chroot/unchroot-as-root.exp b/test/chroot/unchroot-as-root.exp index aed2f8a62..f67590768 100755 --- a/test/chroot/unchroot-as-root.exp +++ b/test/chroot/unchroot-as-root.exp @@ -11,7 +11,7 @@ send -- "firejail --chroot=/tmp/chroot\r" expect { timeout {puts "TESTING ERROR 0\n";exit} "Error: --chroot option is not available on Grsecurity systems" {puts "\nall done\n"; exit} - "Child process initialized" {puts "chroot available\n"}; + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "chroot available\n"}; } sleep 1 diff --git a/test/environment/allow-debuggers.exp b/test/environment/allow-debuggers.exp index 412e24e9b..f972b5788 100755 --- a/test/environment/allow-debuggers.exp +++ b/test/environment/allow-debuggers.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --allow-debuggers\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" { puts "\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" { puts "\n"} "is disabled on Linux kernels prior to 4.8" { puts "TESTING SKIP: kernel too old\n"; exit } } after 100 diff --git a/test/environment/csh.exp b/test/environment/csh.exp index eedb1bab7..31bfbfa40 100755 --- a/test/environment/csh.exp +++ b/test/environment/csh.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --private --shell=/bin/csh\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/environment/dash.exp b/test/environment/dash.exp index c2ece31f0..4dd5cac9f 100755 --- a/test/environment/dash.exp +++ b/test/environment/dash.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --private --tracelog --shell=/bin/dash\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/environment/deterministic-exit-code.exp b/test/environment/deterministic-exit-code.exp index d7585c401..9f5be2c3d 100755 --- a/test/environment/deterministic-exit-code.exp +++ b/test/environment/deterministic-exit-code.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -32,7 +32,7 @@ after 100 send -- "firejail --deterministic-exit-code\r" expect { timeout {puts "TESTING ERROR 3\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/environment/dns.exp b/test/environment/dns.exp index 1fe6449b7..b5a8c119b 100755 --- a/test/environment/dns.exp +++ b/test/environment/dns.exp @@ -30,7 +30,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1.5\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 1.6\n";exit} @@ -47,7 +47,7 @@ expect { "DNS server 8.8.8.8" {puts "TESTING ERROR 2.3\n";exit} "DNS server 4.2.2.1" {puts "TESTING ERROR 2.4\n";exit} "DNS server ::2" {puts "TESTING ERROR 2.5\n";exit} - "Child process initialized" {puts "TESTING ERROR 2.6\n";exit} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "TESTING ERROR 2.6\n";exit} "Parent is shutting down, bye..." {puts "TESTING ERROR 2.7\n";exit} "root" } @@ -56,7 +56,7 @@ after 100 send -- "firejail --dns=8.8.4.4 --dns=8.8.8.8 --dns=4.2.2.1 --dns=::2\r" expect { timeout {puts "TESTING ERROR 3\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -85,7 +85,7 @@ sleep 1 send -- "firejail --profile=dns.profile\r" expect { timeout {puts "TESTING ERROR 5.1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/environment/doubledash.exp b/test/environment/doubledash.exp index 1a9ecebe1..dd2725426 100755 --- a/test/environment/doubledash.exp +++ b/test/environment/doubledash.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail -- ls -- -testdir\r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 2\n";exit} @@ -26,7 +26,7 @@ sleep 1 send -- "firejail --name=testing -- -testdir/bash\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 diff --git a/test/environment/env.exp b/test/environment/env.exp index b5ebe883c..9394f2066 100755 --- a/test/environment/env.exp +++ b/test/environment/env.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --env=ENV1=env1 --env=ENV2=env2 --env=ENV3=env3\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -37,7 +37,7 @@ after 100 send -- "firejail --profile=env.profile\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "env | grep LD_LIBRARY_PATH\r" diff --git a/test/environment/extract_command.exp b/test/environment/extract_command.exp index e719e6658..45ff1f291 100755 --- a/test/environment/extract_command.exp +++ b/test/environment/extract_command.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 2\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 2\n";exit} diff --git a/test/environment/firejail-in-firejail.exp b/test/environment/firejail-in-firejail.exp index 10d5c9074..4a60d5611 100755 --- a/test/environment/firejail-in-firejail.exp +++ b/test/environment/firejail-in-firejail.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail\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/environment/hostfile.exp b/test/environment/hostfile.exp index 709eb5d36..ccc8d049e 100755 --- a/test/environment/hostfile.exp +++ b/test/environment/hostfile.exp @@ -15,7 +15,7 @@ expect { } expect { timeout {puts "TESTING ERROR 2\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 diff --git a/test/environment/ibus.exp b/test/environment/ibus.exp index e6095dc44..e9dd290a1 100755 --- a/test/environment/ibus.exp +++ b/test/environment/ibus.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 diff --git a/test/environment/keep-fd.exp b/test/environment/keep-fd.exp index 222234ceb..440cbd860 100755 --- a/test/environment/keep-fd.exp +++ b/test/environment/keep-fd.exp @@ -47,7 +47,7 @@ after 100 send -- "firejail --noprofile\r" expect { timeout {puts "TESTING ERROR 2\n";exit} - "Child process initialized" + -re {Child process initialized in [0-9]+.[0-9]+ ms} } after 100 @@ -83,7 +83,7 @@ after 500 send -- "firejail --noprofile --keep-fd=\$READ_FD\r" expect { timeout {puts "TESTING ERROR 6\n";exit} - "Child process initialized" + -re {Child process initialized in [0-9]+.[0-9]+ ms} } after 100 @@ -119,7 +119,7 @@ after 500 send -- "firejail --noprofile --keep-fd=\$WRITE_FD\r" expect { timeout {puts "TESTING ERROR 10\n";exit} - "Child process initialized" + -re {Child process initialized in [0-9]+.[0-9]+ ms} } after 100 @@ -155,7 +155,7 @@ after 500 send -- "firejail --noprofile --keep-fd=\$READ_FD,\$WRITE_FD\r" expect { timeout {puts "TESTING ERROR 14\n";exit} - "Child process initialized" + -re {Child process initialized in [0-9]+.[0-9]+ ms} } after 100 @@ -191,7 +191,7 @@ after 500 send -- "firejail --noprofile --keep-fd=all\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/environment/machineid.exp b/test/environment/machineid.exp index b7eb5c911..2392dc9d6 100755 --- a/test/environment/machineid.exp +++ b/test/environment/machineid.exp @@ -15,7 +15,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 send -- "exit\r" diff --git a/test/environment/nice.exp b/test/environment/nice.exp index 69e641448..823d10c67 100755 --- a/test/environment/nice.exp +++ b/test/environment/nice.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --nice=15\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -39,7 +39,7 @@ after 100 send -- "firejail --profile=nice.profile\r" expect { timeout {puts "TESTING ERROR 10\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -70,7 +70,7 @@ after 100 send -- "firejail --nice=-5\r" expect { timeout {puts "TESTING ERROR 17\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/environment/rlimit-join.exp b/test/environment/rlimit-join.exp index 42a8df390..9e7161241 100755 --- a/test/environment/rlimit-join.exp +++ b/test/environment/rlimit-join.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --noprofile --name=\"rlimit testing\"\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -21,11 +21,15 @@ expect { timeout {puts "TESTING ERROR 1\n";exit} "Switching to pid" } +expect { + timeout {puts "TESTING ERROR 2\n";exit} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" +} sleep 1 send -- "cat /proc/self/limits\r" expect { - timeout {puts "TESTING ERROR 2\n";exit} + timeout {puts "TESTING ERROR 3\n";exit} "Max open files 1234 1234" } after 100 diff --git a/test/environment/rlimit-profile.exp b/test/environment/rlimit-profile.exp index d0365d5e3..762f70ba9 100755 --- a/test/environment/rlimit-profile.exp +++ b/test/environment/rlimit-profile.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --profile=rlimit.profile\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/environment/rlimit.exp b/test/environment/rlimit.exp index 3bdbab4c2..acc87277b 100755 --- a/test/environment/rlimit.exp +++ b/test/environment/rlimit.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --rlimit-fsize=1024 --rlimit-nproc=1000 --rlimit-nofile=500 --rlimit-sigpending=200 --rlimit-as=1234567890\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/environment/shell-none.exp b/test/environment/shell-none.exp index 0af1bb88b..512e2efc2 100755 --- a/test/environment/shell-none.exp +++ b/test/environment/shell-none.exp @@ -24,7 +24,7 @@ after 100 send -- "firejail --shell=none ls\r" expect { timeout {puts "TESTING ERROR 2\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 3\n";exit} @@ -35,7 +35,7 @@ after 100 send -- "firejail --profile=shell-none.profile ls\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 5\n";exit} diff --git a/test/environment/sound.exp b/test/environment/sound.exp index 784cdfe1b..7ee1c74d7 100755 --- a/test/environment/sound.exp +++ b/test/environment/sound.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --nosound speaker-test\r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 2\n";exit} @@ -22,7 +22,7 @@ sleep 2 send -- "firejail --nosound aplay -l\r" 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} @@ -39,7 +39,7 @@ sleep 2 send -- "firejail --profile=sound.profile speaker-test\r" expect { timeout {puts "TESTING ERROR 11\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 12\n";exit} @@ -50,7 +50,7 @@ sleep 2 send -- "firejail --profile=sound.profile aplay -l\r" expect { timeout {puts "TESTING ERROR 13\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 14\n";exit} @@ -67,7 +67,7 @@ sleep 2 send -- "firejail aplay -l\r" expect { timeout {puts "TESTING ERROR 23\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 24\n";exit} diff --git a/test/environment/timeout.exp b/test/environment/timeout.exp index 901bed2e8..b38881c81 100755 --- a/test/environment/timeout.exp +++ b/test/environment/timeout.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "time firejail --timeout=00:00:05\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/environment/umask.exp b/test/environment/umask.exp index d336ed2cd..46bd80a92 100755 --- a/test/environment/umask.exp +++ b/test/environment/umask.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --noprofile\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/environment/zsh.exp b/test/environment/zsh.exp index 13eee3433..9f871ea54 100755 --- a/test/environment/zsh.exp +++ b/test/environment/zsh.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --private --shell=/bin/zsh\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/features/1.1.exp b/test/features/1.1.exp index 1262ff403..916a610a6 100755 --- a/test/features/1.1.exp +++ b/test/features/1.1.exp @@ -18,7 +18,7 @@ set chroot [lindex $argv 1] send -- "firejail --noprofile\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -40,7 +40,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -61,7 +61,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --chroot=/tmp/chroot\r" 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/features/1.10.exp b/test/features/1.10.exp index 846532e71..53279f71e 100755 --- a/test/features/1.10.exp +++ b/test/features/1.10.exp @@ -18,7 +18,7 @@ set chroot [lindex $argv 1] send -- "firejail --noprofile\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -41,7 +41,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -63,7 +63,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --chroot=/tmp/chroot\r" 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/features/1.2.exp b/test/features/1.2.exp index 76b143a40..3043f0104 100755 --- a/test/features/1.2.exp +++ b/test/features/1.2.exp @@ -18,7 +18,7 @@ set chroot [lindex $argv 1] send -- "firejail --noprofile\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -64,7 +64,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -105,7 +105,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --chroot=/tmp/chroot\r" 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/features/1.4.exp b/test/features/1.4.exp index 7b4839bd7..b7e8246a2 100755 --- a/test/features/1.4.exp +++ b/test/features/1.4.exp @@ -18,7 +18,7 @@ set chroot [lindex $argv 1] send -- "firejail --noprofile\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -53,7 +53,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -86,7 +86,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --chroot=/tmp/chroot\r" 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/features/1.5.exp b/test/features/1.5.exp index a13a87893..cce8f490f 100755 --- a/test/features/1.5.exp +++ b/test/features/1.5.exp @@ -18,7 +18,7 @@ set chroot [lindex $argv 1] send -- "firejail --noprofile\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -40,7 +40,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -61,7 +61,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --chroot=/tmp/chroot\r" 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/features/1.6.exp b/test/features/1.6.exp index e53c6e2bf..81da44c64 100755 --- a/test/features/1.6.exp +++ b/test/features/1.6.exp @@ -18,7 +18,7 @@ set chroot [lindex $argv 1] send -- "firejail --noprofile\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -40,7 +40,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -61,7 +61,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --chroot=/tmp/chroot\r" 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/features/1.7.exp b/test/features/1.7.exp index f0987dcdc..a84b723de 100755 --- a/test/features/1.7.exp +++ b/test/features/1.7.exp @@ -20,7 +20,7 @@ sleep 1 send -- "firejail --noprofile\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -42,7 +42,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -63,7 +63,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --chroot=/tmp/chroot\r" 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/features/1.8.exp b/test/features/1.8.exp index 36c85e1cf..5f7b0cdbc 100755 --- a/test/features/1.8.exp +++ b/test/features/1.8.exp @@ -19,7 +19,7 @@ sleep 1 send -- "firejail --noprofile\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -71,7 +71,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 send -- "ls ~/.config/firejail\r" @@ -122,7 +122,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --chroot=/tmp/chroot\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "ls ~/.config/firejail\r" diff --git a/test/features/2.1.exp b/test/features/2.1.exp index 586ab6490..b56cbc135 100755 --- a/test/features/2.1.exp +++ b/test/features/2.1.exp @@ -18,7 +18,7 @@ set chroot [lindex $argv 1] send -- "firejail --noprofile --hostname=bingo\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -56,7 +56,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -93,7 +93,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --hostname=bingo --chroot=/tmp/chroot\r" 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/features/2.2.exp b/test/features/2.2.exp index 18828de12..378bd529a 100755 --- a/test/features/2.2.exp +++ b/test/features/2.2.exp @@ -18,7 +18,7 @@ set chroot [lindex $argv 1] send -- "firejail --noprofile --dns=4.2.2.1\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -48,7 +48,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -77,7 +77,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --dns=4.2.2.1 --chroot=/tmp/chroot\r" 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/features/2.3.exp b/test/features/2.3.exp index dba3a47e1..5a188ccc3 100755 --- a/test/features/2.3.exp +++ b/test/features/2.3.exp @@ -18,7 +18,7 @@ set chroot [lindex $argv 1] send -- "firejail --noprofile --net=eth0 --dns=8.8.8.8 --dns=8.8.4.4\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -62,7 +62,7 @@ sleep 3 send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --dns=8.8.8.8 --dns=8.8.4.4\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -111,7 +111,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -155,7 +155,7 @@ if { $overlay == "overlay" } { send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --overlay --dns=8.8.8.8 --dns=8.8.4.4\r" expect { timeout {puts "TESTING ERROR 2\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -205,7 +205,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --net=eth0 --chroot=/tmp/chroot --dns=8.8.8.8 --dns=8.8.4.4\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -249,7 +249,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --chroot=/tmp/chroot --dns=8.8.8.8 --dns=8.8.4.4\r" 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/features/2.4.exp b/test/features/2.4.exp index e2f080617..15159c9b7 100755 --- a/test/features/2.4.exp +++ b/test/features/2.4.exp @@ -19,7 +19,7 @@ set chroot [lindex $argv 1] send -- "firejail --noprofile --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 @@ -56,7 +56,7 @@ sleep 1 send -- "firejail --noprofile --net=br0 --ip=10.10.20.4\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -99,7 +99,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -136,7 +136,7 @@ if { $overlay == "overlay" } { send -- "firejail --noprofile --net=br0 --ip=10.10.20.4 --overlay\r" expect { timeout {puts "TESTING ERROR 2\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -179,7 +179,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --net=br0 --chroot=/tmp/chroot\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -208,7 +208,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --net=br0 --ip=10.10.20.4 --chroot=/tmp/chroot\r" 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/features/2.5.exp b/test/features/2.5.exp index ed8a01b36..2995d34f7 100755 --- a/test/features/2.5.exp +++ b/test/features/2.5.exp @@ -18,7 +18,7 @@ set chroot [lindex $argv 1] send -- "firejail --noprofile --interface=eth0.5\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -51,7 +51,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -84,7 +84,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --chroot=/tmp/chroot --interface=eth0.7\r" 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/features/2.6.exp b/test/features/2.6.exp index 081bdeb94..e8cd780ee 100755 --- a/test/features/2.6.exp +++ b/test/features/2.6.exp @@ -18,7 +18,7 @@ set chroot [lindex $argv 1] send -- "firejail --noprofile --net=eth0 --defaultgw=192.168.1.10 --protocol=unix,inet,netlink\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -39,7 +39,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -60,7 +60,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --chroot=/tmp/chroot --net=eth0 --defaultgw=192.168.1.10 --protocol=unix,inet,netlink\r" 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/features/3.1.exp b/test/features/3.1.exp index dcf51fc9c..95d1d609b 100755 --- a/test/features/3.1.exp +++ b/test/features/3.1.exp @@ -18,7 +18,7 @@ set chroot [lindex $argv 1] send -- "firejail --noprofile --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 @@ -70,7 +70,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -120,7 +120,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --chroot=/tmp/chroot --private\r" 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/features/3.10.exp b/test/features/3.10.exp index e6dbbf93b..5d4414f40 100755 --- a/test/features/3.10.exp +++ b/test/features/3.10.exp @@ -22,7 +22,7 @@ sleep 1 send -- "firejail --noprofile --whitelist=/tmp/test1dir\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -78,7 +78,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -136,7 +136,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --chroot=/tmp/chroot --whitelist=/tmp/test1dir\r" 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/features/3.11.exp b/test/features/3.11.exp index bf528ef25..8287f9dbf 100755 --- a/test/features/3.11.exp +++ b/test/features/3.11.exp @@ -21,7 +21,7 @@ sleep 1 send -- "firejail --profile=3.11.profile\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -73,7 +73,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 10\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -127,7 +127,7 @@ if { $chroot == "chroot" } { send -- "firejail --profile=3.11.profile\r" expect { timeout {puts "TESTING ERROR 20\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/features/3.2.exp b/test/features/3.2.exp index b4a0b04fe..9af0513ea 100755 --- a/test/features/3.2.exp +++ b/test/features/3.2.exp @@ -20,7 +20,7 @@ sleep 1 send -- "firejail --noprofile --read-only=/home/netblue/.config\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -41,7 +41,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -64,7 +64,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --chroot=/tmp/chroot --read-only=/home/netblue/.config\r" 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/features/3.3.exp b/test/features/3.3.exp index fc1a982ec..71b6f70db 100755 --- a/test/features/3.3.exp +++ b/test/features/3.3.exp @@ -18,7 +18,7 @@ set chroot [lindex $argv 1] send -- "firejail --noprofile --blacklist=/home/netblue/.config\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -40,7 +40,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -61,7 +61,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --chroot=/tmp/chroot --blacklist=/home/netblue/.config\r" 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/features/3.4.exp b/test/features/3.4.exp index 0e1a7df5f..d3f894da2 100755 --- a/test/features/3.4.exp +++ b/test/features/3.4.exp @@ -18,7 +18,7 @@ set chroot [lindex $argv 1] send -- "firejail --noprofile --whitelist=/home/netblue/.config\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -83,7 +83,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -147,7 +147,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --chroot=/tmp/chroot --whitelist=/home/netblue/.config\r" 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/features/3.5.exp b/test/features/3.5.exp index a595df398..c19680d41 100755 --- a/test/features/3.5.exp +++ b/test/features/3.5.exp @@ -18,7 +18,7 @@ set chroot [lindex $argv 1] send -- "firejail --noprofile --private-dev\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -41,7 +41,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -64,7 +64,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --chroot=/tmp/chroot --private-dev\r" 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/features/3.6.exp b/test/features/3.6.exp index 439b40411..31978e764 100755 --- a/test/features/3.6.exp +++ b/test/features/3.6.exp @@ -18,7 +18,7 @@ set chroot [lindex $argv 1] send -- "firejail --noprofile --private-etc=group,hostname,hosts,nsswitch.conf,passwd,resolv.conf,skel\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -40,7 +40,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -68,7 +68,7 @@ if { $chroot == "chroot" } { expect { timeout {puts "TESTING ERROR 5\n";exit} "chroot option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/features/3.7.exp b/test/features/3.7.exp index b966f34e5..4a0cb0d79 100755 --- a/test/features/3.7.exp +++ b/test/features/3.7.exp @@ -22,7 +22,7 @@ sleep 1 send -- "firejail --noprofile --private-tmp\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -49,7 +49,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -76,7 +76,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --chroot=/tmp/chroot --private-tmp\r" 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/features/3.8.exp b/test/features/3.8.exp index 0fa74813c..0a53599a9 100755 --- a/test/features/3.8.exp +++ b/test/features/3.8.exp @@ -18,7 +18,7 @@ set chroot [lindex $argv 1] send -- "firejail --noprofile --private-bin=bash,cat,cp,ls,wc\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -41,7 +41,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -68,7 +68,7 @@ if { $chroot == "chroot" } { } expect { timeout {puts "TESTING ERROR 5\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/features/3.9.exp b/test/features/3.9.exp index 47db477ca..7d843e7cc 100755 --- a/test/features/3.9.exp +++ b/test/features/3.9.exp @@ -18,7 +18,7 @@ set chroot [lindex $argv 1] send -- "firejail --noprofile --whitelist=/dev/tty --whitelist=/dev/null\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -42,7 +42,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -65,7 +65,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --chroot=/tmp/chroot --whitelist=/dev/tty --whitelist=/dev/null\r" 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/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 diff --git a/test/fs/fs_dev_shm.exp b/test/fs/fs_dev_shm.exp index 0c819fe99..5d57a8975 100755 --- a/test/fs/fs_dev_shm.exp +++ b/test/fs/fs_dev_shm.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 send -- "stty -echo\r" @@ -52,7 +52,7 @@ sleep 1 send -- "firejail\r" expect { timeout {puts "TESTING ERROR 7\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 send -- "stty -echo\r" diff --git a/test/fs/fs_var_lock.exp b/test/fs/fs_var_lock.exp index e2efd389d..ce3eb836e 100755 --- a/test/fs/fs_var_lock.exp +++ b/test/fs/fs_var_lock.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 send -- "stty -echo\r" @@ -53,7 +53,7 @@ sleep 1 send -- "firejail\r" expect { timeout {puts "TESTING ERROR 7\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 send -- "stty -echo\r" diff --git a/test/fs/fs_var_tmp.exp b/test/fs/fs_var_tmp.exp index b8e7ea73d..8c2da085f 100755 --- a/test/fs/fs_var_tmp.exp +++ b/test/fs/fs_var_tmp.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 send -- "stty -echo\r" @@ -53,7 +53,7 @@ sleep 1 send -- "firejail\r" expect { timeout {puts "TESTING ERROR 7\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 send -- "stty -echo\r" diff --git a/test/fs/fscheck-tmpfs.exp b/test/fs/fscheck-tmpfs.exp index c9d237d72..223bb63ba 100755 --- a/test/fs/fscheck-tmpfs.exp +++ b/test/fs/fscheck-tmpfs.exp @@ -24,7 +24,7 @@ if { ! [file exists /tmp/fjtest-dir] } { send -- "firejail --noprofile --tmpfs=~/fjtest-dir\r" expect { timeout {puts "TESTING ERROR 3\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 500 diff --git a/test/fs/kmsg.exp b/test/fs/kmsg.exp index acaca2cd0..e7d765bff 100755 --- a/test/fs/kmsg.exp +++ b/test/fs/kmsg.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail\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/fs/macro.exp b/test/fs/macro.exp index 1d32a9cd0..c01123f41 100755 --- a/test/fs/macro.exp +++ b/test/fs/macro.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --profile=macro-whitelist.profile ls ~\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} @@ -42,7 +42,7 @@ sleep 1 send -- "firejail --profile=macro-blacklist.profile ls ~/Desktop\r" expect { timeout {puts "TESTING ERROR 7\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 8\n";exit} @@ -53,7 +53,7 @@ sleep 1 send -- "firejail --profile=macro-blacklist.profile ls ~/Documents\r" expect { timeout {puts "TESTING ERROR 9n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 10\n";exit} @@ -64,7 +64,7 @@ sleep 1 send -- "firejail --profile=macro-blacklist.profile ls ~/Downloads\r" expect { timeout {puts "TESTING ERROR 11n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 12n";exit} @@ -75,7 +75,7 @@ sleep 1 send -- "firejail --profile=macro-blacklist.profile ls ~/Music\r" expect { timeout {puts "TESTING ERROR 13\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 14\n";exit} @@ -86,7 +86,7 @@ sleep 1 send -- "firejail --profile=macro-blacklist.profile ls ~/Pictures\r" expect { timeout {puts "TESTING ERROR 15\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 16\n";exit} @@ -97,7 +97,7 @@ sleep 1 send -- "firejail --profile=macro-blacklist.profile ls ~/Videos\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 18\n";exit} @@ -108,7 +108,7 @@ sleep 1 send -- "firejail --profile=macro-readonly.profile touch ~/Desktop/blablabla\r" expect { timeout {puts "TESTING ERROR 19\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 20\n";exit} @@ -119,7 +119,7 @@ sleep 1 send -- "firejail --profile=macro-readonly.profile touch ~/Documents/blablabla\r" expect { timeout {puts "TESTING ERROR 21\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 22\n";exit} @@ -130,7 +130,7 @@ sleep 1 send -- "firejail --profile=macro-readonly.profile touch ~/Downloads/blablabla\r" expect { timeout {puts "TESTING ERROR 23\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 24\n";exit} @@ -141,7 +141,7 @@ sleep 1 send -- "firejail --profile=macro-readonly.profile touch ~/Music/blablabla\r" expect { timeout {puts "TESTING ERROR 25\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 26\n";exit} @@ -152,7 +152,7 @@ sleep 1 send -- "firejail --profile=macro-readonly.profile touch ~/Pictures/blablabla\r" expect { timeout {puts "TESTING ERROR 27\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 28\n";exit} @@ -163,7 +163,7 @@ sleep 1 send -- "firejail --profile=macro-readonly.profile touch ~/Videos/blablabla\r" expect { timeout {puts "TESTING ERROR 29\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 30\n";exit} diff --git a/test/fs/mkdir_mkfile.exp b/test/fs/mkdir_mkfile.exp index 406f2c87f..c1dce58ea 100755 --- a/test/fs/mkdir_mkfile.exp +++ b/test/fs/mkdir_mkfile.exp @@ -12,7 +12,7 @@ match_max 100000 send -- "firejail --private --profile=mkdir_mkfile.profile\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/fs/noblacklist-blacklist-noexec.exp b/test/fs/noblacklist-blacklist-noexec.exp index 7a3fb8263..3bc5e7c79 100755 --- a/test/fs/noblacklist-blacklist-noexec.exp +++ b/test/fs/noblacklist-blacklist-noexec.exp @@ -12,7 +12,7 @@ set PWD $env(PWD) send -- "firejail --noprofile --noblacklist=$PWD --blacklist=$PWD --noexec=$PWD\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/fs/noblacklist-blacklist-readonly.exp b/test/fs/noblacklist-blacklist-readonly.exp index d164184e7..b5d3ef045 100755 --- a/test/fs/noblacklist-blacklist-readonly.exp +++ b/test/fs/noblacklist-blacklist-readonly.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --noprofile --noblacklist=~ --blacklist=~ --read-only=~\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/fs/option_blacklist.exp b/test/fs/option_blacklist.exp index f3e1ec5a1..9e1533435 100755 --- a/test/fs/option_blacklist.exp +++ b/test/fs/option_blacklist.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --blacklist=/var\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 send -- "stty -echo\r" diff --git a/test/fs/option_blacklist_file.exp b/test/fs/option_blacklist_file.exp index 638c25f6a..93284a140 100755 --- a/test/fs/option_blacklist_file.exp +++ b/test/fs/option_blacklist_file.exp @@ -15,7 +15,7 @@ after 100 send -- "firejail --blacklist=/etc/passwd --blacklist=~/_firejail_test_dir\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/fs/option_blacklist_glob.exp b/test/fs/option_blacklist_glob.exp index bea08767e..83b123a4b 100755 --- a/test/fs/option_blacklist_glob.exp +++ b/test/fs/option_blacklist_glob.exp @@ -19,7 +19,7 @@ after 100 send -- "firejail --blacklist=~/_firejail_test_dir/*\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "cd ~/_firejail_test_dir\r" diff --git a/test/fs/private-bin.exp b/test/fs/private-bin.exp index 301141579..e4b36e114 100755 --- a/test/fs/private-bin.exp +++ b/test/fs/private-bin.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --private-bin=bash,ls,sh\r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -40,7 +40,7 @@ sleep 1 send -- "firejail --profile=private-bin.profile\r" expect { timeout {puts "TESTING ERROR 7\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/fs/private-cache.exp b/test/fs/private-cache.exp index 4abfdcef0..f21d799b4 100755 --- a/test/fs/private-cache.exp +++ b/test/fs/private-cache.exp @@ -21,7 +21,7 @@ if { ! [file exists ~/.cache/abcdefg] } { send -- "firejail --noprofile --private-cache\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/fs/private-etc-empty.exp b/test/fs/private-etc-empty.exp index f1ced02c7..6878a642c 100755 --- a/test/fs/private-etc-empty.exp +++ b/test/fs/private-etc-empty.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --private-etc=blablabla\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -26,7 +26,7 @@ sleep 1 send -- "firejail --profile=private-etc-empty.profile\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/fs/private-etc.exp b/test/fs/private-etc.exp index 2b7fcd83d..f51fc5221 100755 --- a/test/fs/private-etc.exp +++ b/test/fs/private-etc.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --private-etc=passwd,group,resolv.conf,X11\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/fs/private-home-dir.exp b/test/fs/private-home-dir.exp index 14eebaf8b..e46d2b113 100755 --- a/test/fs/private-home-dir.exp +++ b/test/fs/private-home-dir.exp @@ -30,7 +30,7 @@ sleep 1 send -- "firejail --private=~/_firejail_test_dir1_\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -83,7 +83,7 @@ expect { } expect { timeout {puts "TESTING ERROR 12\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/fs/private-home.exp b/test/fs/private-home.exp index fbe40a89b..99456a211 100755 --- a/test/fs/private-home.exp +++ b/test/fs/private-home.exp @@ -26,7 +26,7 @@ after 100 send -- "firejail --private-home=_firejail_test_file1,_firejail_test_file2,_firejail_test_dir1\r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 @@ -86,7 +86,7 @@ after 100 send -- "firejail --private-home=_firejail_test_link2\r" expect { timeout {puts "TESTING ERROR 10\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 send -- "file ~/_firejail_test_link2\r" diff --git a/test/fs/private-homedir.exp b/test/fs/private-homedir.exp index f14d20c7b..0b4348514 100755 --- a/test/fs/private-homedir.exp +++ b/test/fs/private-homedir.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --private=~\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/fs/private-lib.exp b/test/fs/private-lib.exp index 6ad48beb7..5290def35 100755 --- a/test/fs/private-lib.exp +++ b/test/fs/private-lib.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --private-lib --private-bin=sh,bash,dash,ps,grep,ls,find,echo,stty \r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 send -- "stty -echo\r" diff --git a/test/fs/private-whitelist.exp b/test/fs/private-whitelist.exp index 1c2a13d16..48add880c 100755 --- a/test/fs/private-whitelist.exp +++ b/test/fs/private-whitelist.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --private --whitelist=/tmp/.X11-unix\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/fs/private.exp b/test/fs/private.exp index d2cac6b05..ff8e0c66e 100755 --- a/test/fs/private.exp +++ b/test/fs/private.exp @@ -26,7 +26,7 @@ after 100 send -- "firejail --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/fs/read-write.exp b/test/fs/read-write.exp index 138834209..f0ef0842c 100755 --- a/test/fs/read-write.exp +++ b/test/fs/read-write.exp @@ -19,7 +19,7 @@ after 100 send -- "firejail --read-only=~/_firejail_test_dir --read-write=~/_firejail_test_dir/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 diff --git a/test/fs/sys_fs.exp b/test/fs/sys_fs.exp index f501b48ca..ce1fb04de 100755 --- a/test/fs/sys_fs.exp +++ b/test/fs/sys_fs.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail\r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -27,7 +27,7 @@ sleep 1 send -- "firejail --noblacklist=/sys/fs\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/fs/whitelist-dev.exp b/test/fs/whitelist-dev.exp index 83e6bad49..7459462f8 100755 --- a/test/fs/whitelist-dev.exp +++ b/test/fs/whitelist-dev.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --whitelist=/dev/null --debug\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -26,7 +26,7 @@ sleep 1 send -- "firejail --whitelist=/dev/null --whitelist=/dev/random\r" expect { timeout {puts "TESTING ERROR 2\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -42,7 +42,7 @@ sleep 1 send -- "firejail --private-dev --debug\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -97,7 +97,7 @@ if { $have_snd > 0 } { send -- "firejail --private-dev --nosound ls /dev\r" expect { timeout {puts "TESTING ERROR 7\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 8\n";exit} @@ -114,7 +114,7 @@ if { $have_dvd > 0 } { send -- "firejail --private-dev --nodvd ls /dev\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} @@ -135,7 +135,7 @@ if { $have_dri > 0 } { send -- "firejail --private-dev --no3d ls /dev\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 18\n";exit} diff --git a/test/fs/whitelist-double.exp b/test/fs/whitelist-double.exp index f9eeee038..b3b48f2cd 100755 --- a/test/fs/whitelist-double.exp +++ b/test/fs/whitelist-double.exp @@ -13,7 +13,7 @@ sleep 1 send -- "firejail --whitelist=/tmp/_firejail_test_file --whitelist=/tmp/_firejail_test_file\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/fs/whitelist-empty.exp b/test/fs/whitelist-empty.exp index cd72b3ef9..18d4561d6 100755 --- a/test/fs/whitelist-empty.exp +++ b/test/fs/whitelist-empty.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --whitelist=~/blablabla --whitelist=/tmp/blablabla --whitelist=/media/blablabla --whitelist=/var/blablabla --whitelist=/dev/blablabla --whitelist=/opt/blablabla\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/fs/whitelist-noexec.exp b/test/fs/whitelist-noexec.exp index d997aba72..ba3ca4d92 100755 --- a/test/fs/whitelist-noexec.exp +++ b/test/fs/whitelist-noexec.exp @@ -12,7 +12,7 @@ set PWD $env(PWD) send -- "firejail --noprofile --whitelist=$PWD --noexec=$PWD\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/fs/whitelist-readonly.exp b/test/fs/whitelist-readonly.exp index 4c29c746b..676131ade 100755 --- a/test/fs/whitelist-readonly.exp +++ b/test/fs/whitelist-readonly.exp @@ -19,7 +19,7 @@ after 100 send -- "firejail --noprofile --whitelist=~/_firejail_test_dir --read-only=~\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/fs/whitelist-whitespace.exp b/test/fs/whitelist-whitespace.exp index 66a4f8549..885b90f2a 100755 --- a/test/fs/whitelist-whitespace.exp +++ b/test/fs/whitelist-whitespace.exp @@ -13,7 +13,7 @@ after 100 send -- "firejail --noprofile --whitelist=~/filewith\\\ \\\ many\\\ whitespaces\\\ \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/fs/whitelist.exp b/test/fs/whitelist.exp index 2a970ca37..8e98b9dfa 100755 --- a/test/fs/whitelist.exp +++ b/test/fs/whitelist.exp @@ -36,7 +36,7 @@ after 200 send -- "firejail --whitelist=~/fjtest-file --whitelist=~/fjtest-dir --debug\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -73,7 +73,7 @@ sleep 1 send -- "firejail --whitelist=~/fjtest-dir/fjtest-dir/fjtest-file\r" expect { timeout {puts "TESTING ERROR 10\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -98,7 +98,7 @@ sleep 1 send -- "firejail --whitelist=~/fjtest-file-lnk --whitelist=~/fjtest-dir-lnk\r" expect { timeout {puts "TESTING ERROR 20\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 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 diff --git a/test/overlay/firefox-x11-xorg.exp b/test/overlay/firefox-x11-xorg.exp index da8948b86..691e58437 100755 --- a/test/overlay/firefox-x11-xorg.exp +++ b/test/overlay/firefox-x11-xorg.exp @@ -36,7 +36,7 @@ expect { send -- "firejail --overlay --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/overlay/firefox-x11.exp b/test/overlay/firefox-x11.exp index 652385cda..96c6796bb 100755 --- a/test/overlay/firefox-x11.exp +++ b/test/overlay/firefox-x11.exp @@ -36,7 +36,7 @@ expect { send -- "firejail --name=blablabla --overlay\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/overlay/firefox.exp b/test/overlay/firefox.exp index d77d85498..eb7276f99 100755 --- a/test/overlay/firefox.exp +++ b/test/overlay/firefox.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 10 @@ -47,7 +47,7 @@ expect { send -- "firejail --name=blablabla --overlay\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/overlay/fs-named.exp b/test/overlay/fs-named.exp index d2bfd43a3..25762337b 100755 --- a/test/overlay/fs-named.exp +++ b/test/overlay/fs-named.exp @@ -12,7 +12,7 @@ expect { timeout {puts "TESTING ERROR 2\n";exit} "not available for kernels older than 3.18" {puts "\nTESTING: overlayfs not available\n"; exit} "Error: --overlay option is not available on Grsecurity systems" {puts "\nTESTING: overlayfs not available\n"; exit} - "Child process initialized" {puts "found\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "found\n"} } sleep 1 send -- "stty -echo\r" @@ -52,7 +52,7 @@ expect { timeout {puts "TESTING ERROR 2\n";exit} "not available for kernels older than 3.18" {puts "\nTESTING: overlayfs not available\n"; exit} "Error: --overlay option is not available on Grsecurity systems" {puts "\nTESTING: overlayfs not available\n"; exit} - "Child process initialized" {puts "found\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "found\n"} } sleep 1 diff --git a/test/overlay/fs-tmpfs.exp b/test/overlay/fs-tmpfs.exp index c3794ffed..442a0fffa 100755 --- a/test/overlay/fs-tmpfs.exp +++ b/test/overlay/fs-tmpfs.exp @@ -21,7 +21,7 @@ expect { timeout {puts "TESTING ERROR 1\n";exit} "not available for kernels older than 3.18" {puts "\nTESTING: overlayfs not available\n"; exit} "Error: --overlay option is not available on Grsecurity systems" {puts "\nTESTING: overlayfs not available\n"; exit} - "Child process initialized" {puts "found\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "found\n"} } sleep 1 send -- "stty -echo\r" diff --git a/test/overlay/fs.exp b/test/overlay/fs.exp index 85d8c50b1..21de942ec 100755 --- a/test/overlay/fs.exp +++ b/test/overlay/fs.exp @@ -12,7 +12,7 @@ expect { timeout {puts "TESTING ERROR 2\n";exit} "not available for kernels older than 3.18" {puts "\nTESTING: overlayfs not available\n"; exit} "Error: --overlay option is not available on Grsecurity systems" {puts "\nTESTING: overlayfs not available\n"; exit} - "Child process initialized" {puts "found\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "found\n"} } sleep 1 diff --git a/test/private-lib/atril.exp b/test/private-lib/atril.exp index b420f4477..cad118c0a 100755 --- a/test/private-lib/atril.exp +++ b/test/private-lib/atril.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/private-lib/eog.exp b/test/private-lib/eog.exp index dc6771482..c4bfc0aa7 100755 --- a/test/private-lib/eog.exp +++ b/test/private-lib/eog.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/private-lib/eom.exp b/test/private-lib/eom.exp index 6ddf3edbe..a7709b0ec 100755 --- a/test/private-lib/eom.exp +++ b/test/private-lib/eom.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/private-lib/evince.exp b/test/private-lib/evince.exp index e21ce1fb9..8f54ee345 100755 --- a/test/private-lib/evince.exp +++ b/test/private-lib/evince.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/private-lib/galculator.exp b/test/private-lib/galculator.exp index 7438b0be6..4cf6b6a73 100755 --- a/test/private-lib/galculator.exp +++ b/test/private-lib/galculator.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/private-lib/gedit.exp b/test/private-lib/gedit.exp index c89630613..838ffad21 100755 --- a/test/private-lib/gedit.exp +++ b/test/private-lib/gedit.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/private-lib/gnome-calculator.exp b/test/private-lib/gnome-calculator.exp index e0e4b5f8c..37e6b86cb 100755 --- a/test/private-lib/gnome-calculator.exp +++ b/test/private-lib/gnome-calculator.exp @@ -16,7 +16,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -43,7 +43,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/private-lib/gnome-logs.exp b/test/private-lib/gnome-logs.exp index c5ed97578..3f0cc3544 100755 --- a/test/private-lib/gnome-logs.exp +++ b/test/private-lib/gnome-logs.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/private-lib/gnome-nettool.exp b/test/private-lib/gnome-nettool.exp index 51382ba0b..3a08fe3df 100755 --- a/test/private-lib/gnome-nettool.exp +++ b/test/private-lib/gnome-nettool.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/private-lib/gnome-system-log.exp b/test/private-lib/gnome-system-log.exp index 60047e020..5ab819a89 100755 --- a/test/private-lib/gnome-system-log.exp +++ b/test/private-lib/gnome-system-log.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/private-lib/gpicview.exp b/test/private-lib/gpicview.exp index 7aa9e6e16..ea0964787 100755 --- a/test/private-lib/gpicview.exp +++ b/test/private-lib/gpicview.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/private-lib/leafpad.exp b/test/private-lib/leafpad.exp index 79f13d98c..9e4dc7fed 100755 --- a/test/private-lib/leafpad.exp +++ b/test/private-lib/leafpad.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/private-lib/mousepad.exp b/test/private-lib/mousepad.exp index 96923caa9..9c7501473 100755 --- a/test/private-lib/mousepad.exp +++ b/test/private-lib/mousepad.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/private-lib/pavucontrol.exp b/test/private-lib/pavucontrol.exp index 896a53863..3aeda709a 100755 --- a/test/private-lib/pavucontrol.exp +++ b/test/private-lib/pavucontrol.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/private-lib/pluma.exp b/test/private-lib/pluma.exp index 955142511..64cb16d5a 100755 --- a/test/private-lib/pluma.exp +++ b/test/private-lib/pluma.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/private-lib/transmission-gtk.exp b/test/private-lib/transmission-gtk.exp index 4ecc4fa5a..0f297cc42 100755 --- a/test/private-lib/transmission-gtk.exp +++ b/test/private-lib/transmission-gtk.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/private-lib/xcalc.exp b/test/private-lib/xcalc.exp index 6eb56e360..e9c541684 100755 --- a/test/private-lib/xcalc.exp +++ b/test/private-lib/xcalc.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 3 @@ -41,7 +41,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/profiles/conditional.exp b/test/profiles/conditional.exp index 97ac01503..40bae3878 100755 --- a/test/profiles/conditional.exp +++ b/test/profiles/conditional.exp @@ -14,7 +14,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 send -- "exit\r" @@ -24,7 +24,7 @@ send -- "firejail --debug --profile=cond1.profile\r" expect { timeout {puts "TESTING ERROR 2\n";exit} "conditional HAS_NODBUS, private" {puts "TESTING ERROR 3\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 send -- "exit\r" diff --git a/test/profiles/ignore.exp b/test/profiles/ignore.exp index 7d13a8b72..df4337e1e 100755 --- a/test/profiles/ignore.exp +++ b/test/profiles/ignore.exp @@ -17,7 +17,7 @@ send -- "firejail --debug --ignore=seccomp\r" expect { timeout {puts "TESTING ERROR 1\n";exit} BLACKLIST {puts "TESTING ERROR 2\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 send -- "exit\r" @@ -26,7 +26,7 @@ sleep 1 send -- "firejail --ignore=seccomp --ignore=shell --profile=ignore.profile \r" expect { timeout {puts "TESTING ERROR 3\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 @@ -42,7 +42,7 @@ sleep 1 send -- "firejail --ignore=private --ignore=shell --profile=ignore.profile \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 @@ send -- "firejail --debug --profile=ignore2.profile\r" expect { timeout {puts "TESTING ERROR 7\n";exit} BLACKLIST {puts "TESTING ERROR 8\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 @@ -69,7 +69,7 @@ sleep 1 send -- "firejail --ignore=quiet --ignore=shell --profile=ignore.profile \r" expect { timeout {puts "TESTING ERROR 9\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 diff --git a/test/profiles/profile_comment.exp b/test/profiles/profile_comment.exp index 907635c2f..73e92d864 100755 --- a/test/profiles/profile_comment.exp +++ b/test/profiles/profile_comment.exp @@ -15,7 +15,7 @@ sleep 1 send -- "firejail --profile=comment.profile /usr/bin/true\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} @@ -36,7 +36,7 @@ after 100 send -- "firejail --profile=/tmp/firejailtest.profile /usr/bin/true\r" 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} diff --git a/test/profiles/profile_followlnk.exp b/test/profiles/profile_followlnk.exp index c41276cfb..112acbbc9 100755 --- a/test/profiles/profile_followlnk.exp +++ b/test/profiles/profile_followlnk.exp @@ -16,7 +16,7 @@ sleep 1 send -- "firejail --profile=readonly-lnk.profile\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } send -- "ls > /tmp/firejailtestdirlnk/ttt\r" diff --git a/test/profiles/profile_readonly.exp b/test/profiles/profile_readonly.exp index 8dc598034..4c1bcba89 100755 --- a/test/profiles/profile_readonly.exp +++ b/test/profiles/profile_readonly.exp @@ -14,7 +14,7 @@ sleep 1 send -- "firejail --profile=readonly.profile\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/profiles/profile_syntax.exp b/test/profiles/profile_syntax.exp index d02bb65f0..2bce76d83 100755 --- a/test/profiles/profile_syntax.exp +++ b/test/profiles/profile_syntax.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --profile=test.profile\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/root/apache2.exp b/test/root/apache2.exp index c3e520224..a6b25de2f 100755 --- a/test/root/apache2.exp +++ b/test/root/apache2.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --name=apache /etc/init.d/apache2 start\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/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 diff --git a/test/root/firemon-events.exp b/test/root/firemon-events.exp index f2c0879db..8eab93a2a 100755 --- a/test/root/firemon-events.exp +++ b/test/root/firemon-events.exp @@ -18,7 +18,7 @@ set firejail_id $spawn_id send -- "firejail\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } # get messages on firemon diff --git a/test/root/isc-dhcp.exp b/test/root/isc-dhcp.exp index 86291a9f9..20e5ef408 100755 --- a/test/root/isc-dhcp.exp +++ b/test/root/isc-dhcp.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --name=dhcpd /etc/init.d/isc-dhcp-server start\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/root/join.exp b/test/root/join.exp index 19b4c8f02..291ee9115 100755 --- a/test/root/join.exp +++ b/test/root/join.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --name=jointesting --cpu=0 --nice=2\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 @@ -21,14 +21,18 @@ expect { timeout {puts "TESTING ERROR 1\n";exit} "Switching to pid" } +expect { + timeout {puts "TESTING ERROR 2\n";exit} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" +} sleep 1 send -- "ps aux\r" expect { - timeout {puts "TESTING ERROR 2\n";exit} + timeout {puts "TESTING ERROR 3\n";exit} "/bin/bash" } expect { - timeout {puts "TESTING ERROR 3\n";exit} + timeout {puts "TESTING ERROR 4\n";exit} "/bin/bash" } @@ -36,15 +40,15 @@ send -- "exit\r" sleep 1 send -- "firejail --join-network=jointesting\r" expect { - timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + timeout {puts "TESTING ERROR 5\n";exit} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } send -- "exit\r" sleep 1 send -- "firejail --join-filesystem=jointesting\r" expect { - timeout {puts "TESTING ERROR 5\n";exit} - "Child process initialized" + timeout {puts "TESTING ERROR 6\n";exit} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 diff --git a/test/root/login_nobody.exp b/test/root/login_nobody.exp index cf3df268d..9c0932196 100755 --- a/test/root/login_nobody.exp +++ b/test/root/login_nobody.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "su - nobody -s /usr/bin/firejail\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 diff --git a/test/root/nginx.exp b/test/root/nginx.exp index af1ab8eb9..40d8cb51e 100755 --- a/test/root/nginx.exp +++ b/test/root/nginx.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --name=nginx /etc/init.d/nginx start\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/root/option_bind_directory.exp b/test/root/option_bind_directory.exp index 122a1ea79..4fabf0cd8 100755 --- a/test/root/option_bind_directory.exp +++ b/test/root/option_bind_directory.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --bind=/tmp/chroot,mntpoint\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/root/option_bind_file.exp b/test/root/option_bind_file.exp index 4e02638e6..6c796a2b0 100755 --- a/test/root/option_bind_file.exp +++ b/test/root/option_bind_file.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --bind=tmpfile,/etc/passwd\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/root/option_tmpfs.exp b/test/root/option_tmpfs.exp index b40335680..13820afe8 100755 --- a/test/root/option_tmpfs.exp +++ b/test/root/option_tmpfs.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --tmpfs=/var\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/root/private.exp b/test/root/private.exp index edc2520a2..70d0218fa 100755 --- a/test/root/private.exp +++ b/test/root/private.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --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 @@ -42,7 +42,7 @@ after 100 send -- "firejail --private-opt=firejail-test-file,firejail-test-dir --debug\r" expect { timeout {puts "TESTING ERROR 3\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -57,7 +57,7 @@ sleep 1 send -- "firejail --whitelist=/opt/firejail-test-file --whitelist=/opt/firejail-test-dir --debug\r" expect { timeout {puts "TESTING ERROR 3.1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -80,7 +80,7 @@ after 100 send -- "firejail --private-srv=firejail-test-file,firejail-test-dir --debug\r" expect { timeout {puts "TESTING ERROR 5\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -95,7 +95,7 @@ sleep 1 send -- "firejail --whitelist=/srv/firejail-test-file --whitelist=/srv/firejail-test-dir --debug\r" expect { timeout {puts "TESTING ERROR 5.1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/root/profile_tmpfs.exp b/test/root/profile_tmpfs.exp index 8625f100a..fba63773f 100755 --- a/test/root/profile_tmpfs.exp +++ b/test/root/profile_tmpfs.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --profile=tmpfs.profile\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/root/seccomp-chmod.exp b/test/root/seccomp-chmod.exp index 8fbb687d5..ef0453548 100755 --- a/test/root/seccomp-chmod.exp +++ b/test/root/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 2 diff --git a/test/root/seccomp-chown.exp b/test/root/seccomp-chown.exp index 0d9262494..968a4bc96 100755 --- a/test/root/seccomp-chown.exp +++ b/test/root/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/root/seccomp-umount.exp b/test/root/seccomp-umount.exp index 51a7c7647..b99ec30f7 100755 --- a/test/root/seccomp-umount.exp +++ b/test/root/seccomp-umount.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --seccomp --noprofile\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/root/snmpd.exp b/test/root/snmpd.exp index 7658cfc68..510abfbad 100755 --- a/test/root/snmpd.exp +++ b/test/root/snmpd.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --name=snmpd /etc/init.d/snmpd start\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/root/unbound.exp b/test/root/unbound.exp index 9e000be5e..6440304b2 100755 --- a/test/root/unbound.exp +++ b/test/root/unbound.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --name=unbound unbound\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/root/whitelist.exp b/test/root/whitelist.exp index 1e29e3fef..2397f6a90 100755 --- a/test/root/whitelist.exp +++ b/test/root/whitelist.exp @@ -16,7 +16,7 @@ after 100 send -- "firejail --whitelist=/mnt/firejail-test-file --whitelist=/mnt/firejail-test-dir --debug\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -39,7 +39,7 @@ after 100 send -- "firejail --whitelist=/opt/firejail-test-file --whitelist=/opt/firejail-test-dir --debug\r" expect { timeout {puts "TESTING ERROR 2\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -61,7 +61,7 @@ after 100 send -- "firejail --whitelist=/media/firejail-test-file --whitelist=/media/firejail-test-dir --debug\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -78,7 +78,7 @@ sleep 1 send -- "firejail --whitelist=/var/run --whitelist=/var/lock --debug\r" expect { timeout {puts "TESTING ERROR 6\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -100,7 +100,7 @@ after 100 send -- "firejail --whitelist=/srv/firejail-test-file --whitelist=/srv/firejail-test-dir --debug\r" 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/ssh/login.exp b/test/ssh/login.exp index d6ff434b5..5d6a6216b 100755 --- a/test/ssh/login.exp +++ b/test/ssh/login.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "ssh firejail-test@0\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" {puts "OK\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "OK\n"} "an existing sandbox was detected" {puts "OK\n"} } sleep 1 diff --git a/test/ssh/scp.exp b/test/ssh/scp.exp index 2305b8f50..13163564b 100755 --- a/test/ssh/scp.exp +++ b/test/ssh/scp.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "ssh firejail-test@0\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" {puts "OK\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "OK\n"} "an existing sandbox was detected" {puts "OK\n"} } sleep 1 @@ -33,7 +33,7 @@ sleep 1 send -- "ssh firejail-test@0\r" expect { timeout {puts "TESTING ERROR 2\n";exit} - "Child process initialized" {puts "OK\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "OK\n"} "an existing sandbox was detected" {puts "OK\n"} } sleep 1 diff --git a/test/ssh/sftp.exp b/test/ssh/sftp.exp index bc1647b0a..01c1e7e04 100755 --- a/test/ssh/sftp.exp +++ b/test/ssh/sftp.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "ssh firejail-test@0\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" {puts "OK\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "OK\n"} "an existing sandbox was detected" {puts "OK\n"} } sleep 1 @@ -45,7 +45,7 @@ sleep 1 send -- "ssh firejail-test@0\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" {puts "OK\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "OK\n"} "an existing sandbox was detected" {puts "OK\n"} } sleep 1 diff --git a/test/stress/blacklist.exp b/test/stress/blacklist.exp index 255719426..7d32ad114 100755 --- a/test/stress/blacklist.exp +++ b/test/stress/blacklist.exp @@ -14,7 +14,7 @@ set i 1 send -- "firejail --profile=blacklist.profile\r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } while { $i <= $MAXi } { @@ -36,7 +36,7 @@ set i 1 send -- "firejail --profile=noblacklist.profile\r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } while { $i <= $MAXi } { diff --git a/test/stress/env.exp b/test/stress/env.exp index 931eef569..5411819ec 100755 --- a/test/stress/env.exp +++ b/test/stress/env.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --profile=env.profile\r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } send -- "env | grep FJSTRESS77\r" diff --git a/test/stress/net_macvlan.exp b/test/stress/net_macvlan.exp index 05c2c1589..f17067cbb 100755 --- a/test/stress/net_macvlan.exp +++ b/test/stress/net_macvlan.exp @@ -15,7 +15,7 @@ while { $i <= $MAXi } { send -- "firejail --net=eth0 --ip=192.168.1.$i\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } incr i after 100 @@ -30,7 +30,7 @@ while { $i <= $MAXi } { send -- "firejail --net=eth0 --iprange=192.168.1.201,192.168.1.220\r" expect { timeout {puts "TESTING ERROR 2\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } puts "************ $i ******************\n" incr i diff --git a/test/utils/caps-print.exp b/test/utils/caps-print.exp index 76aad24f5..b6ccd05d4 100755 --- a/test/utils/caps-print.exp +++ b/test/utils/caps-print.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --name=test\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/utils/cpu-print.exp b/test/utils/cpu-print.exp index de081e82b..3e4d63f2a 100755 --- a/test/utils/cpu-print.exp +++ b/test/utils/cpu-print.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --name=test --cpu=0\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "cat /proc/self/status | grep Cpus\r" @@ -30,7 +30,7 @@ sleep 1 send -- "firejail --name=test --cpu=1\r" expect { timeout {puts "TESTING ERROR 3\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/utils/dns-print.exp b/test/utils/dns-print.exp index 034f2a6b9..c0cf2ff0f 100755 --- a/test/utils/dns-print.exp +++ b/test/utils/dns-print.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --name=test --dns=1.2.3.4 --dns=::2\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/utils/firemon-caps.exp b/test/utils/firemon-caps.exp index dc229a85d..02b317341 100755 --- a/test/utils/firemon-caps.exp +++ b/test/utils/firemon-caps.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --name=bingo1 --noprofile --caps\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=bingo2 --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 @@ -26,7 +26,7 @@ spawn $env(SHELL) send -- "firejail --name=bingo3 --noprofile --caps.drop=all\r" expect { timeout {puts "TESTING ERROR 2\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -34,7 +34,7 @@ spawn $env(SHELL) send -- "firejail --noprofile --name=bingo4 --caps.drop=chown,kill\r" expect { timeout {puts "TESTING ERROR 3\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -42,7 +42,7 @@ spawn $env(SHELL) send -- "firejail --noprofile --name=bingo5 --caps.keep=chown,kill\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -50,7 +50,7 @@ spawn $env(SHELL) send -- "firejail --name=bingo6 --profile=caps1.profile\r" expect { timeout {puts "TESTING ERROR 5\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -58,7 +58,7 @@ spawn $env(SHELL) send -- "firejail --name=bingo7 --profile=caps2.profile\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/utils/firemon-cgroup.exp b/test/utils/firemon-cgroup.exp index 1e4c4a398..2dbc04a50 100755 --- a/test/utils/firemon-cgroup.exp +++ b/test/utils/firemon-cgroup.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/utils/firemon-cpu.exp b/test/utils/firemon-cpu.exp index cb9cff188..db5069ede 100755 --- a/test/utils/firemon-cpu.exp +++ b/test/utils/firemon-cpu.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/utils/firemon-name.exp b/test/utils/firemon-name.exp index e28a45cfb..f8161cc81 100755 --- a/test/utils/firemon-name.exp +++ b/test/utils/firemon-name.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --name=test\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/utils/firemon-seccomp.exp b/test/utils/firemon-seccomp.exp index bbc38f27a..7eb6f9168 100755 --- a/test/utils/firemon-seccomp.exp +++ b/test/utils/firemon-seccomp.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --noprofile --name=bingo1 --seccomp\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 --noprofile --name=bingo2\r" expect { timeout {puts "TESTING ERROR 0.1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 diff --git a/test/utils/fs-print.exp b/test/utils/fs-print.exp index 09f84ba49..536d59dbd 100755 --- a/test/utils/fs-print.exp +++ b/test/utils/fs-print.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --name=test\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/utils/join-profile.exp b/test/utils/join-profile.exp index 0f51ca0f7..565010b82 100755 --- a/test/utils/join-profile.exp +++ b/test/utils/join-profile.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --profile=name.profile\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 @@ -21,14 +21,18 @@ expect { timeout {puts "TESTING ERROR 1\n";exit} "Switching to pid" } +expect { + timeout {puts "TESTING ERROR 2\n";exit} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" +} sleep 1 send -- "ps aux\r" expect { - timeout {puts "TESTING ERROR 2\n";exit} + timeout {puts "TESTING ERROR 3\n";exit} "/bin/bash" } expect { - timeout {puts "TESTING ERROR 3\n";exit} + timeout {puts "TESTING ERROR 4\n";exit} "/bin/bash" } diff --git a/test/utils/join.exp b/test/utils/join.exp index 9d3dccd92..82decce51 100755 --- a/test/utils/join.exp +++ b/test/utils/join.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --name=jointesting --cpu=0 --nice=2\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 @@ -26,17 +26,21 @@ after 100 send -- "firejail --join=jointesting\r" expect { - timeout {puts "TESTING ERROR 1\n";exit} + timeout {puts "TESTING ERROR 2\n";exit} "Switching to pid" } +expect { + timeout {puts "TESTING ERROR 3\n";exit} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" +} sleep 1 send -- "ps aux\r" expect { - timeout {puts "TESTING ERROR 2\n";exit} + timeout {puts "TESTING ERROR 4\n";exit} "/bin/bash" } expect { - timeout {puts "TESTING ERROR 3\n";exit} + timeout {puts "TESTING ERROR 5\n";exit} "/bin/bash" } @@ -44,13 +48,13 @@ send -- "exit\r" sleep 1 send -- "firejail --join-network=jointesting\r" expect { - timeout {puts "TESTING ERROR 4\n";exit} + timeout {puts "TESTING ERROR 6\n";exit} "is only available to root user" } after 100 send -- "firejail --join-filesystem=jointesting\r" expect { - timeout {puts "TESTING ERROR 5\n";exit} + timeout {puts "TESTING ERROR 7\n";exit} "is only available to root user" } diff --git a/test/utils/join2.exp b/test/utils/join2.exp index d917d42a3..5f5a6bfe0 100755 --- a/test/utils/join2.exp +++ b/test/utils/join2.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --name=\"join testing\"\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 @@ -21,14 +21,18 @@ expect { timeout {puts "TESTING ERROR 1\n";exit} "Switching to pid" } +expect { + timeout {puts "TESTING ERROR 2\n";exit} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" +} sleep 1 send -- "ps aux\r" expect { - timeout {puts "TESTING ERROR 2\n";exit} + timeout {puts "TESTING ERROR 3\n";exit} "/bin/bash" } expect { - timeout {puts "TESTING ERROR 3\n";exit} + timeout {puts "TESTING ERROR 4\n";exit} "/bin/bash" } diff --git a/test/utils/join3.exp b/test/utils/join3.exp index 5ace21260..c771b924b 100755 --- a/test/utils/join3.exp +++ b/test/utils/join3.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --name=join\\ testing\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 @@ -21,14 +21,18 @@ expect { timeout {puts "TESTING ERROR 1\n";exit} "Switching to pid" } +expect { + timeout {puts "TESTING ERROR 2\n";exit} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" +} sleep 1 send -- "ps aux\r" expect { - timeout {puts "TESTING ERROR 2\n";exit} + timeout {puts "TESTING ERROR 3\n";exit} "/bin/bash" } expect { - timeout {puts "TESTING ERROR 3\n";exit} + timeout {puts "TESTING ERROR 4\n";exit} "/bin/bash" } diff --git a/test/utils/join4.exp b/test/utils/join4.exp index 23104dc9c..cddf7ad18 100755 --- a/test/utils/join4.exp +++ b/test/utils/join4.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --name=123test\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 @@ -21,14 +21,18 @@ expect { timeout {puts "TESTING ERROR 1\n";exit} "Switching to pid" } +expect { + timeout {puts "TESTING ERROR 2\n";exit} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" +} sleep 1 send -- "ps aux\r" expect { - timeout {puts "TESTING ERROR 2\n";exit} + timeout {puts "TESTING ERROR 3\n";exit} "/bin/bash" } expect { - timeout {puts "TESTING ERROR 3\n";exit} + timeout {puts "TESTING ERROR 4\n";exit} "/bin/bash" } diff --git a/test/utils/join5.exp b/test/utils/join5.exp index 44167cffb..c0990ebf1 100755 --- a/test/utils/join5.exp +++ b/test/utils/join5.exp @@ -9,8 +9,8 @@ match_max 100000 send -- "firejail --name=test123 --profile=join5.profile\r" expect { - timeout {puts "TESTING ERROR 5\n";exit} - "Child process initialized" + timeout {puts "TESTING ERROR 0\n";exit} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 spawn $env(SHELL) @@ -19,14 +19,18 @@ expect { timeout {puts "TESTING ERROR 1\n";exit} "Switching to pid" } +expect { + timeout {puts "TESTING ERROR 2\n";exit} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" +} sleep 1 send -- "ps aux\r" expect { - timeout {puts "TESTING ERROR 2\n";exit} + timeout {puts "TESTING ERROR 3\n";exit} "/bin/bash" } expect { - timeout {puts "TESTING ERROR 3\n";exit} + timeout {puts "TESTING ERROR 4\n";exit} "/bin/bash" } @@ -35,11 +39,11 @@ after 100 send -- "firejail --protocol.print=test123\r" expect { - timeout {puts "TESTING ERROR 4\n";exit} + timeout {puts "TESTING ERROR 5\n";exit} "Switching to pid" } expect { - timeout {puts "TESTING ERROR 5\n";exit} + timeout {puts "TESTING ERROR 6\n";exit} "unix" } diff --git a/test/utils/list.exp b/test/utils/list.exp index 48711fe4b..30344e22a 100755 --- a/test/utils/list.exp +++ b/test/utils/list.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 @@ -18,7 +18,7 @@ spawn $env(SHELL) send -- "firejail\r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 @@ -26,7 +26,7 @@ spawn $env(SHELL) send -- "firejail\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/utils/ls.exp b/test/utils/ls.exp index 9dac20628..6b6c67ede 100755 --- a/test/utils/ls.exp +++ b/test/utils/ls.exp @@ -14,7 +14,7 @@ sleep 1 send -- "firejail --private --name=test\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 send -- "echo my_testing > ~/lstesting\r" 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 diff --git a/test/utils/profile_print.exp b/test/utils/profile_print.exp index d64a4a2ad..9b2d65d84 100755 --- a/test/utils/profile_print.exp +++ b/test/utils/profile_print.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 diff --git a/test/utils/protocol-print.exp b/test/utils/protocol-print.exp index 2e581a03a..ca74b7fc9 100755 --- a/test/utils/protocol-print.exp +++ b/test/utils/protocol-print.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --name=test\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/utils/seccomp-print.exp b/test/utils/seccomp-print.exp index 51bbfb874..a9525ce2e 100755 --- a/test/utils/seccomp-print.exp +++ b/test/utils/seccomp-print.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --name=test\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/utils/shutdown.exp b/test/utils/shutdown.exp index 13580cbdf..3950e901c 100755 --- a/test/utils/shutdown.exp +++ b/test/utils/shutdown.exp @@ -11,7 +11,7 @@ match_max 100000 send -- "firejail --name=shutdowntesting\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/utils/shutdown2.exp b/test/utils/shutdown2.exp index 2ffe2d8ae..4dabf6c23 100755 --- a/test/utils/shutdown2.exp +++ b/test/utils/shutdown2.exp @@ -12,7 +12,7 @@ set firstspawn $spawn_id send -- "firejail --name=shutdowntesting ./catchsignal.sh\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/utils/shutdown3.exp b/test/utils/shutdown3.exp index e96ded14d..8017d753d 100755 --- a/test/utils/shutdown3.exp +++ b/test/utils/shutdown3.exp @@ -12,7 +12,7 @@ set firstspawn $spawn_id send -- "firejail --name=shutdowntesting ./catchsignal-master.sh\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/utils/shutdown4.exp b/test/utils/shutdown4.exp index a94cac64b..09db3f140 100755 --- a/test/utils/shutdown4.exp +++ b/test/utils/shutdown4.exp @@ -12,7 +12,7 @@ set firstspawn $spawn_id send -- "firejail --name=shutdowntesting ./catchsignal2.sh\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/utils/top.exp b/test/utils/top.exp index 515b4ffbf..402d7c2df 100755 --- a/test/utils/top.exp +++ b/test/utils/top.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/utils/trace.exp b/test/utils/trace.exp index 890884248..f14001c88 100755 --- a/test/utils/trace.exp +++ b/test/utils/trace.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail --trace mkdir ttt\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} @@ -21,7 +21,7 @@ sleep 1 send -- "firejail --trace rmdir ttt\r" expect { timeout {puts "TESTING ERROR 2\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 3\n";exit} @@ -32,7 +32,7 @@ sleep 1 send -- "firejail --trace touch ttt\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 5\n";exit} @@ -44,7 +44,7 @@ sleep 1 send -- "firejail --trace rm ttt\r" expect { timeout {puts "TESTING ERROR 6\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 7\n";exit} @@ -55,7 +55,7 @@ sleep 1 send -- "firejail --trace wget -q debian.org\r" #expect { # timeout {puts "TESTING ERROR 8.1\n";exit} -# "Child process initialized" +# -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" #} #expect { # timeout {puts "TESTING ERROR 8.2\n";exit} @@ -86,7 +86,7 @@ sleep 1 send -- "firejail --trace rm index.html\r" expect { timeout {puts "TESTING ERROR 9\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 10\n";exit} @@ -98,7 +98,7 @@ sleep 1 send -- "firejail --trace\r" expect { timeout {puts "TESTING ERROR 11\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } expect { timeout {puts "TESTING ERROR 12\n";exit} diff --git a/test/utils/tree.exp b/test/utils/tree.exp index 9cdb09639..4b1f70bd2 100755 --- a/test/utils/tree.exp +++ b/test/utils/tree.exp @@ -10,7 +10,7 @@ match_max 100000 send -- "firejail\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 @@ -18,7 +18,7 @@ spawn $env(SHELL) send -- "firejail\r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } after 100 @@ -26,7 +26,7 @@ spawn $env(SHELL) send -- "firejail\r" expect { timeout {puts "TESTING ERROR 2\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 -- cgit v1.2.3-54-g00ecf