--timeout testing and fixes (#1614)

2 files changed, 34 insertions, 0 deletions

diff --git a/test/environment/environment.sh b/test/environment/environment.sh
index 308d99871..844e90cb8 100755
--- a/test/environment/environment.sh
+++ b/test/environment/environment.sh
@@ -7,6 +7,9 @@ export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 
 
+echo "TESTING: timeout (test/environment/timeout.exp)"
+./timeout.exp
+
 echo "TESTING: DNS (test/environment/dns.exp)"
 ./dns.exp
 
diff --git a/test/environment/timeout.exp b/test/environment/timeout.exp
new file mode 100755
index 000000000..ac29c57ba
--- /dev/null
+++ b/test/environment/timeout.exp
@@ -0,0 +1,31 @@
+#!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2017 Firejail Authors
+# License GPL v2
+
+set timeout 10
+spawn $env(SHELL)
+match_max 100000
+
+send -- "time firejail --timeout=00:00:05\r"
+expect {
+        timeout {puts "TESTING ERROR 0\n";exit}
+        "Child process initialized"
+}
+sleep 1
+
+sleep 3
+send -- "env\r"
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "container=firejail"
+}
+
+expect {
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "m5."  {puts "5 seconds"}
+        "m6."  {puts "6 seconds"}
+        "m7." {puts "7 seconds"}
+}
+
+puts "\nall done\n"