fix --ignore=quiet

4 files changed, 50 insertions, 7 deletions

diff --git a/test/private-lib/gnome-calculator.exp b/test/private-lib/gnome-calculator.exp
index 590da34cf..6d20c36f4 100755
--- a/test/private-lib/gnome-calculator.exp
+++ b/test/private-lib/gnome-calculator.exp
@@ -7,7 +7,9 @@ set timeout 10
 spawn $env(SHELL)
 match_max 100000
 
-send -- "firejail gnome-calculator\r"
+# gnome-calculator uses quiet at the top of the profile
+# we need to use --ignore
+send -- "firejail --ignore=quiet gnome-calculator\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "Reading profile /etc/firejail/gnome-calculator.profile"
@@ -50,7 +52,7 @@ send -- "firemon --seccomp\r"
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
         "need to be root" {puts "/proc mounted as hidepid, exiting...\n"; exit}
-        ":firejail gnome-calculator"
+        ":firejail --ignore=quiet gnome-calculator"
 }
 expect {
         timeout {puts "TESTING ERROR 5.1 (seccomp)\n";exit}
@@ -64,7 +66,7 @@ after 100
 send -- "firemon --caps\r"
 expect {
         timeout {puts "TESTING ERROR 6\n";exit}
-        ":firejail gnome-calculator"
+        ":firejail --ignore=quiet gnome-calculator"
 }
 expect {
         timeout {puts "TESTING ERROR 6.1\n";exit}
diff --git a/test/profiles/ignore.exp b/test/profiles/ignore.exp
index cdb38e97b..8463d6cc8 100755
--- a/test/profiles/ignore.exp
+++ b/test/profiles/ignore.exp
@@ -19,7 +19,7 @@ expect {
         BLACKLIST {puts "TESTING ERROR 2\n";exit}
         "Child process initialized"
 }
-sleep 1
+after 100
 send -- "exit\r"
 sleep 1
 
@@ -28,23 +28,58 @@ expect {
         timeout {puts "TESTING ERROR 3\n";exit}
         "Child process initialized"
 }
-sleep 1
+after 100
 
 send -- "ps aux | wc -l\r"
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
         "5"
 }
+after 100
+send -- "exit\r"
 sleep 1
+
+send -- "firejail --ignore=private --ignore=shell --profile=ignore.profile \r"
+expect {
+        timeout {puts "TESTING ERROR 5\n";exit}
+        "Child process initialized"
+}
+after 100
+
+send -- "ps aux | wc -l\r"
+expect {
+        timeout {puts "TESTING ERROR 6\n";exit}
+        "5"
+}
+after 100
 send -- "exit\r"
 sleep 1
 
 send -- "firejail --debug --profile=ignore2.profile\r"
 expect {
-        timeout {puts "TESTING ERROR 5\n";exit}
-        BLACKLIST {puts "TESTING ERROR 6\n";exit}
+        timeout {puts "TESTING ERROR 7\n";exit}
+        BLACKLIST {puts "TESTING ERROR 8\n";exit}
         "Child process initialized"
 }
 
 after 100
+send -- "exit\r"
+sleep 1
+
+send -- "firejail --ignore=quiet --ignore=shell --profile=ignore.profile \r"
+expect {
+        timeout {puts "TESTING ERROR 9\n";exit}
+        "Child process initialized"
+}
+after 100
+
+send -- "ps aux | wc -l\r"
+expect {
+        timeout {puts "TESTING ERROR 10\n";exit}
+        "5"
+}
+after 100
+send -- "exit\r"
+after 100
+
 puts "\nall done\n"
diff --git a/test/profiles/ignore2.profile b/test/profiles/ignore2.profile
index 49fcd8324..c85cd9544 100644
--- a/test/profiles/ignore2.profile
+++ b/test/profiles/ignore2.profile
@@ -1,3 +1,5 @@
 ignore seccomp
+ignore shell
 private
 seccomp
+shell none
diff --git a/test/profiles/ignore3.profile b/test/profiles/ignore3.profile
new file mode 100644
index 000000000..f0c9699e1
--- /dev/null
+++ b/test/profiles/ignore3.profile
@@ -0,0 +1,4 @@
+quiet
+private
+seccomp
+shell none