23 files changed, 62 insertions, 3 deletions

diff --git a/test/environment/quiet.exp b/test/environment/quiet.exp
index 3ab6d7f53..0df798f01 100755
--- a/test/environment/quiet.exp
+++ b/test/environment/quiet.exp
@@ -7,7 +7,8 @@ set timeout 4
 spawn $env(SHELL)
 match_max 100000
 
-# check ip address
+send -- "stty -echo\r"
+after 100
 send -- "firejail --quiet echo done\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
diff --git a/test/fcopy/dircopy.exp b/test/fcopy/dircopy.exp
index e8462ae82..ae6ffecf0 100755
--- a/test/fcopy/dircopy.exp
+++ b/test/fcopy/dircopy.exp
@@ -118,6 +118,8 @@ expect {
 }
 after 100
 
+send -- "stty -echo\r"
+after 100
 send -- "diff -q src/a/b/file4 dest/a/b/file4; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 16\n";exit}
diff --git a/test/fcopy/filecopy.exp b/test/fcopy/filecopy.exp
index 824a22bba..8074f2ee8 100755
--- a/test/fcopy/filecopy.exp
+++ b/test/fcopy/filecopy.exp
@@ -35,6 +35,8 @@ expect {
         "rwxrwxr-x" { puts "umask 0002\n" }
 }
 after 100
+send -- "stty -echo\r"
+after 100
 
 send -- "diff -q dircopy.exp dest/dircopy.exp; echo done\r"
 expect {
diff --git a/test/fcopy/linkcopy.exp b/test/fcopy/linkcopy.exp
index 46ee327cb..ea64329c1 100755
--- a/test/fcopy/linkcopy.exp
+++ b/test/fcopy/linkcopy.exp
@@ -34,6 +34,8 @@ expect {
         "lrwxrwxrwx"
 }
 after 100
+send -- "stty -echo\r"
+after 100
 
 send -- "diff -q dircopy.exp dest/dircopy.exp; echo done\r"
 expect {
diff --git a/test/filters/seccomp-chmod-profile.exp b/test/filters/seccomp-chmod-profile.exp
index 22615420d..fb4d0665b 100755
--- a/test/filters/seccomp-chmod-profile.exp
+++ b/test/filters/seccomp-chmod-profile.exp
@@ -12,8 +12,10 @@ expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "Child process initialized"
 }
-sleep 2
+sleep 1
 
+send -- "stty -echo\r"
+after 100
 send -- "cd ~; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
diff --git a/test/filters/seccomp-chmod.exp b/test/filters/seccomp-chmod.exp
index 35c6f69c2..1dd9633c2 100755
--- a/test/filters/seccomp-chmod.exp
+++ b/test/filters/seccomp-chmod.exp
@@ -12,8 +12,10 @@ expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "Child process initialized"
 }
-sleep 2
+sleep 1
 
+send -- "stty -echo\r"
+after 100
 send -- "cd ~; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
diff --git a/test/filters/seccomp-debug-32.exp b/test/filters/seccomp-debug-32.exp
index 098b309f5..57087a0b3 100755
--- a/test/filters/seccomp-debug-32.exp
+++ b/test/filters/seccomp-debug-32.exp
@@ -7,6 +7,9 @@ set timeout 10
 spawn $env(SHELL)
 match_max 100000
 
+send -- "stty -echo\r"
+after 100
+
 send --  "firejail --debug sleep 1; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
diff --git a/test/filters/seccomp-debug.exp b/test/filters/seccomp-debug.exp
index 4986a6bf6..f90bbfa03 100755
--- a/test/filters/seccomp-debug.exp
+++ b/test/filters/seccomp-debug.exp
@@ -7,6 +7,9 @@ set timeout 10
 spawn $env(SHELL)
 match_max 100000
 
+send -- "stty -echo\r"
+after 100
+
 send --  "firejail --debug sleep 1; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
diff --git a/test/fs/private-lib.exp b/test/fs/private-lib.exp
index 20d480062..422d8ef21 100755
--- a/test/fs/private-lib.exp
+++ b/test/fs/private-lib.exp
@@ -15,6 +15,7 @@ expect {
 }
 after 100
 send -- "stty -echo\r"
+after 100
 
 send -- "cd /bin; find .\; echo done\r"
 expect {
diff --git a/test/network/bandwidth.exp b/test/network/bandwidth.exp
index 25845c728..db9772789 100755
--- a/test/network/bandwidth.exp
+++ b/test/network/bandwidth.exp
@@ -54,6 +54,9 @@ expect {
 }
 sleep 1
 
+send -- "stty -echo\r"
+after 100
+
 send -- "firejail --bandwidth=test status; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 8\n";exit}
diff --git a/test/network/hostname.exp b/test/network/hostname.exp
index 0acb6a5ac..5dd14e028 100755
--- a/test/network/hostname.exp
+++ b/test/network/hostname.exp
@@ -13,6 +13,8 @@ expect {
         "Child process initialized"
 }
 sleep 1
+send -- "stty -echo\r"
+after 100
 
 send -- "ping -c 3 bingo; echo done\r"
 expect {
diff --git a/test/network/net_noip.exp b/test/network/net_noip.exp
index 9a73f618a..1bde8456e 100755
--- a/test/network/net_noip.exp
+++ b/test/network/net_noip.exp
@@ -18,6 +18,9 @@ sleep 1
 send -- "bash\r"
 sleep 1
 
+send -- "stty -echo\r"
+after 100
+
 # no default gateway configured
 send -- "netstat -rn;echo done\r"
 expect {
diff --git a/test/network/net_noip2.exp b/test/network/net_noip2.exp
index c01f2e4f4..1e41c1b1c 100755
--- a/test/network/net_noip2.exp
+++ b/test/network/net_noip2.exp
@@ -17,6 +17,8 @@ expect {
 sleep 1
 send -- "bash\r"
 sleep 1
+send -- "stty -echo\r"
+after 100
 
 # no default gateway configured
 send -- "netstat -rn;echo done\r"
diff --git a/test/network/net_none.exp b/test/network/net_none.exp
index 0d3701f22..b489d43f3 100755
--- a/test/network/net_none.exp
+++ b/test/network/net_none.exp
@@ -19,6 +19,9 @@ sleep 1
 # test default gw
 send -- "bash\r"
 sleep 1
+send -- "stty -echo\r"
+after 100
+
 send -- "netstat -rn; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
diff --git a/test/overlay/fs-named.exp b/test/overlay/fs-named.exp
index 2519a8ede..0356720bc 100755
--- a/test/overlay/fs-named.exp
+++ b/test/overlay/fs-named.exp
@@ -12,6 +12,8 @@ expect {
         "Child process initialized" {puts "found\n"}
 }
 sleep 1
+send -- "stty -echo\r"
+after 100
 
 send -- "echo xyzxyzxyz > ~/_firejail_test_file; echo done\r"
 expect {
@@ -51,6 +53,8 @@ expect {
 }
 sleep 1
 
+send -- "stty -echo\r"
+after 100
 send -- "cat  ~/_firejail_test_file; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
diff --git a/test/overlay/fs-tmpfs.exp b/test/overlay/fs-tmpfs.exp
index 7c1b5d1df..20fa315b6 100755
--- a/test/overlay/fs-tmpfs.exp
+++ b/test/overlay/fs-tmpfs.exp
@@ -21,6 +21,8 @@ expect {
         "Child process initialized" {puts "found\n"}
 }
 sleep 1
+send -- "stty -echo\r"
+after 100
 
 send -- "echo xyzxyzxyz > ~/_firejail_test_file; echo done\r"
 expect {
@@ -29,6 +31,8 @@ expect {
 }
 after 100
 
+send -- "stty -echo\r"
+after 100
 send -- "cat  ~/_firejail_test_file; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
@@ -43,6 +47,8 @@ after 100
 send -- "exit\r"
 sleep 1
 
+send -- "stty -echo\r"
+after 100
 send -- "cat  ~/_firejail_test_file; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
diff --git a/test/overlay/fs.exp b/test/overlay/fs.exp
index f8478e78b..9debe6536 100755
--- a/test/overlay/fs.exp
+++ b/test/overlay/fs.exp
@@ -13,6 +13,8 @@ expect {
 }
 sleep 1
 
+send -- "stty -echo\r"
+after 100
 send -- "echo xyzxyzxyz > ~/_firejail_test_file; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
@@ -20,6 +22,8 @@ expect {
 }
 after 100
 
+send -- "stty -echo\r"
+after 100
 send -- "cat  ~/_firejail_test_file; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
@@ -34,6 +38,8 @@ after 100
 send -- "exit\r"
 sleep 2
 
+send -- "stty -echo\r"
+after 100
 send -- "cat  ~/_firejail_test_file; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
diff --git a/test/profiles/test-profile.exp b/test/profiles/test-profile.exp
index 63fb3a150..c043f4b9e 100755
--- a/test/profiles/test-profile.exp
+++ b/test/profiles/test-profile.exp
@@ -13,6 +13,8 @@ if { $argc != 1 } {
         exit
 }
 
+send -- "stty -echo\r"
+after 100
 send -- "firejail --profile=$argv echo done\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
diff --git a/test/root/checkcfg.exp b/test/root/checkcfg.exp
index e17e9cda2..9b7402b95 100755
--- a/test/root/checkcfg.exp
+++ b/test/root/checkcfg.exp
@@ -107,6 +107,8 @@ send --  "echo \"xvfb-screen 800x600x24\" >> /etc/firejail/firejail.config\r"
 after 100
 send --  "echo \"xvfb-extra-params blablabla\" >> /etc/firejail/firejail.config\r"
 sleep 1
+send -- "stty -echo\r"
+after 100
 send --  "firejail --noprofile echo done\r"
 expect {
         timeout {puts "TESTING ERROR 11\n";exit}
diff --git a/test/root/firecfg.exp b/test/root/firecfg.exp
index 8210496bb..66c956a85 100755
--- a/test/root/firecfg.exp
+++ b/test/root/firecfg.exp
@@ -17,6 +17,8 @@ expect {
 }
 sleep 1
 
+send -- "stty -echo\r"
+after 100
 send -- "file /usr/local/bin/firefox; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
diff --git a/test/root/seccomp-chmod.exp b/test/root/seccomp-chmod.exp
index 35c6f69c2..dfec5a90e 100755
--- a/test/root/seccomp-chmod.exp
+++ b/test/root/seccomp-chmod.exp
@@ -14,6 +14,8 @@ expect {
 }
 sleep 2
 
+send -- "stty -echo\r"
+after 100
 send -- "cd ~; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
diff --git a/test/root/seccomp-chown.exp b/test/root/seccomp-chown.exp
index 174a35ffe..85846ad96 100755
--- a/test/root/seccomp-chown.exp
+++ b/test/root/seccomp-chown.exp
@@ -14,6 +14,8 @@ expect {
 }
 sleep 2
 
+send -- "stty -echo\r"
+after 100
 send -- "touch testfile; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
diff --git a/test/utils/shutdown.exp b/test/utils/shutdown.exp
index eb87c5d4f..fba76fa7a 100755
--- a/test/utils/shutdown.exp
+++ b/test/utils/shutdown.exp
@@ -16,6 +16,8 @@ expect {
 sleep 2
 
 spawn $env(SHELL)
+send -- "stty -echo\r"
+after 100
 send --  "firejail --shutdown=shutdowntesting; echo done\r"
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}