From bfd93f604a09ae55c7cf9f37e1eea7abf224015a Mon Sep 17 00:00:00 2001 From: netblue30 Date: Mon, 22 Aug 2016 09:05:53 -0400 Subject: testing --- test/environment/csh.exp | 2 +- test/environment/dash.exp | 2 +- test/environment/doubledash.exp | 2 +- test/environment/env.exp | 2 +- test/environment/firejail-in-firejail.exp | 2 +- test/environment/firejail-in-firejail2.exp | 2 +- test/environment/nice.exp | 2 +- test/environment/quiet.exp | 2 +- test/environment/rlimit-profile.exp | 2 +- test/environment/rlimit.exp | 2 +- test/environment/shell-none.exp | 6 +++--- test/environment/sound.exp | 2 +- test/environment/zsh.exp | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) (limited to 'test/environment') diff --git a/test/environment/csh.exp b/test/environment/csh.exp index 2f1ae17b9..46e4bb3ca 100755 --- a/test/environment/csh.exp +++ b/test/environment/csh.exp @@ -30,7 +30,7 @@ expect { "/bin/csh" } send -- "exit\r" -sleep 1 +after 100 puts "\n" diff --git a/test/environment/dash.exp b/test/environment/dash.exp index d727d302e..cd051ea7c 100755 --- a/test/environment/dash.exp +++ b/test/environment/dash.exp @@ -36,7 +36,7 @@ expect { "home" } send -- "exit\r" -sleep 1 +after 100 puts "\n" diff --git a/test/environment/doubledash.exp b/test/environment/doubledash.exp index 7abf4b918..2eaa7d9ce 100755 --- a/test/environment/doubledash.exp +++ b/test/environment/doubledash.exp @@ -55,6 +55,6 @@ expect { "/tmp" } -sleep 1 +after 100 puts "\n" diff --git a/test/environment/env.exp b/test/environment/env.exp index a09c3f9c5..8f72400b0 100755 --- a/test/environment/env.exp +++ b/test/environment/env.exp @@ -31,7 +31,7 @@ expect { "ENV3" } send -- "exit\r" -sleep 1 +after 100 #*********************************************** send -- "firejail --profile=env.profile\r" diff --git a/test/environment/firejail-in-firejail.exp b/test/environment/firejail-in-firejail.exp index 7e7f4fd17..1122b712f 100755 --- a/test/environment/firejail-in-firejail.exp +++ b/test/environment/firejail-in-firejail.exp @@ -19,6 +19,6 @@ expect { timeout {puts "TESTING ERROR 1\n";exit} "Warning: an existing sandbox was detected" } -sleep 1 +after 100 puts "\nall done\n" diff --git a/test/environment/firejail-in-firejail2.exp b/test/environment/firejail-in-firejail2.exp index 5a2213074..37d1c2870 100755 --- a/test/environment/firejail-in-firejail2.exp +++ b/test/environment/firejail-in-firejail2.exp @@ -19,6 +19,6 @@ expect { timeout {puts "TESTING ERROR 1\n";exit} "Child process initialized" } -sleep 1 +after 100 puts "\nall done\n" diff --git a/test/environment/nice.exp b/test/environment/nice.exp index 3a5db71c8..2e0e95ea1 100755 --- a/test/environment/nice.exp +++ b/test/environment/nice.exp @@ -42,7 +42,7 @@ expect { sleep 1 send -- "exit\r" -sleep 1 +after 100 send -- "firejail --profile=nice.profile\r" expect { diff --git a/test/environment/quiet.exp b/test/environment/quiet.exp index 38da4673e..8d7c8d4c0 100755 --- a/test/environment/quiet.exp +++ b/test/environment/quiet.exp @@ -15,7 +15,7 @@ expect { "Child process initialized" {puts "TESTING ERROR 3\n";exit} "done" } -sleep 1 +after 100 puts "\nall done\n" diff --git a/test/environment/rlimit-profile.exp b/test/environment/rlimit-profile.exp index 7ee828bf2..a9e54a405 100755 --- a/test/environment/rlimit-profile.exp +++ b/test/environment/rlimit-profile.exp @@ -29,5 +29,5 @@ expect { timeout {puts "TESTING ERROR 1.4\n";exit} "Max pending signals 200 200" } -sleep 1 +after 100 puts "\nall done\n" diff --git a/test/environment/rlimit.exp b/test/environment/rlimit.exp index 680520b33..611f69821 100755 --- a/test/environment/rlimit.exp +++ b/test/environment/rlimit.exp @@ -33,5 +33,5 @@ expect { timeout {puts "TESTING ERROR 1.5\n";exit} "home" } -sleep 1 +after 100 puts "\n" diff --git a/test/environment/shell-none.exp b/test/environment/shell-none.exp index e30008f83..8f3df794f 100755 --- a/test/environment/shell-none.exp +++ b/test/environment/shell-none.exp @@ -19,7 +19,7 @@ expect { timeout {puts "TESTING ERROR 1\n";exit} "shell=none configured, but no program specified" } -sleep 1 +after 100 send -- "firejail --shell=none ls\r" expect { @@ -30,7 +30,7 @@ expect { timeout {puts "TESTING ERROR 3\n";exit} "environment.sh" } -sleep 1 +after 100 send -- "firejail --profile=shell-none.profile ls\r" expect { @@ -41,7 +41,7 @@ expect { timeout {puts "TESTING ERROR 5\n";exit} "environment.sh" } -sleep 1 +after 100 puts "\nall done\n" diff --git a/test/environment/sound.exp b/test/environment/sound.exp index e2e8fb610..dd55add89 100755 --- a/test/environment/sound.exp +++ b/test/environment/sound.exp @@ -77,7 +77,7 @@ expect { timeout {puts "TESTING ERROR 25\n";exit} "Parent is shutting down" } -sleep 2 +after 100 puts "\nall done\n" diff --git a/test/environment/zsh.exp b/test/environment/zsh.exp index 7ab7faa76..5fca1cf22 100755 --- a/test/environment/zsh.exp +++ b/test/environment/zsh.exp @@ -30,7 +30,7 @@ expect { "/usr/bin/zsh" } send -- "exit\r" -sleep 1 +after 100 puts "\nall done\n" -- cgit v1.2.3-54-g00ecf