6 files changed, 44 insertions, 4 deletions

diff --git a/src/firejail/fs_whitelist.c b/src/firejail/fs_whitelist.c
index 7ad5ffeb8..59dff5517 100644
--- a/src/firejail/fs_whitelist.c
+++ b/src/firejail/fs_whitelist.c
@@ -438,8 +438,8 @@ void fs_whitelist(void) {
                 if (strncmp(new_name, cfg.homedir, strlen(cfg.homedir)) == 0) {
                         // whitelisting home directory is disabled if --private option is present
                         if (arg_private) {
-                                if (arg_debug || arg_debug_whitelists)
-                                        printf("Removed whitelist path %s, --private option is present\n", entry->data);
+                                if (!arg_quiet)
+                                        printf("Warning: \"%s\" disabled by --private\n", entry->data);
 
                                 *entry->data = '\0';
                                 continue;
diff --git a/test/environment/doubledash.exp b/test/environment/doubledash.exp
index 2eaa7d9ce..ed0419f2d 100755
--- a/test/environment/doubledash.exp
+++ b/test/environment/doubledash.exp
@@ -57,4 +57,4 @@ expect {
 
 after 100
 
-puts "\n"
+puts "\nall done\n"
diff --git a/test/root/firecfg.exp b/test/root/firecfg.exp
index c9085e8c8..8961aed60 100755
--- a/test/root/firecfg.exp
+++ b/test/root/firecfg.exp
@@ -43,4 +43,12 @@ expect {
         "/usr/local/bin/firefox"
 }
 after 100
+
+send -- "firecfg --fix\r"
+expect {
+        timeout {puts "TESTING ERROR 5\n";exit}
+        "this option is not supported for root user"
+}
+
+after 100
 puts "\nall done\n"
diff --git a/test/stress/stress.sh b/test/stress/stress.sh
index e95d304c4..6a140ab22 100755
--- a/test/stress/stress.sh
+++ b/test/stress/stress.sh
@@ -15,10 +15,11 @@ rm noblacklist.profile
 rm env.profile
 for i in `seq 1 100`;
 do
-        echo $i
         echo "hello" > ~/fj-stress-test/testfile$i
         echo "blacklist ~/fj-stress-test/testfile$i" >> blacklist.profile
+        echo "blacklist \${PATH}/sh" >> blacklist.profile
         echo "noblacklist ~/fj-stress-test/testfile$i" >> noblacklist.profile
+        echo "noblacklist \${PATH}/sh" >> noblacklist.profile
         echo "env FJSTRESS$i=stress" >> env.profile
 done
 echo "include blacklist.profile" >> noblacklist.profile
@@ -30,6 +31,7 @@ echo "TESTING: stress env (/test/stress/env.exp)"
 ./env.exp
 
 rm -fr ~/fj-stress-test
+
 rm blacklist.profile
 rm noblacklist.profile
 rm env.profile
diff --git a/test/utils/firecfg-fix.exp b/test/utils/firecfg-fix.exp
new file mode 100755
index 000000000..685ce9c7b
--- /dev/null
+++ b/test/utils/firecfg-fix.exp
@@ -0,0 +1,25 @@
+#!/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 -- "firecfg --fix\r"
+expect {
+        timeout {puts "TESTING ERROR 0\n";exit}
+        "created"
+}
+sleep 1
+
+send -- "firecfg --fix\r"
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "skipped"
+}
+sleep 1
+
+puts "\nall done\n"
+
diff --git a/test/utils/utils.sh b/test/utils/utils.sh
index 751f1f8e7..d5ee5ef32 100755
--- a/test/utils/utils.sh
+++ b/test/utils/utils.sh
@@ -112,3 +112,8 @@ echo "TESTING: firemon interface (test/utils/firemon-interface.exp)"
 echo "TESTING: firemon name (test/utils/firemon-name.exp)"
 ./firemon-name.exp
 
+echo "TESTING: firecfg --fix (test/utils/firecfg-fix.exp)"
+mv ~/.local/share/applications ~/firejail-test-local-apps
+./firecfg-fix.exp
+rm -fr ~/.local/share/applications
+mv ~/firejail-test-local-apps ~/.local/share/applications