disable firejail configuration by default

6 files changed, 40 insertions, 24 deletions

diff --git a/test/features/1.1.exp b/test/features/1.1.exp
index 41443a080..5ba123107 100755
--- a/test/features/1.1.exp
+++ b/test/features/1.1.exp
@@ -51,14 +51,14 @@ sleep 1
 #
 send -- "firejail --noprofile --chroot=/tmp/chroot\r"
 expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
+        timeout {puts "TESTING ERROR 4\n";exit}
         "Child process initialized"
 }
 sleep 1
 
 send -- "ls -l /boot | wc -l\r"
 expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
+        timeout {puts "TESTING ERROR 5\n";exit}
         "1"
 }
 after 100
diff --git a/test/features/1.5.exp b/test/features/1.5.exp
index d722c5811..84c00937f 100755
--- a/test/features/1.5.exp
+++ b/test/features/1.5.exp
@@ -51,14 +51,14 @@ sleep 1
 #
 send -- "firejail --noprofile --chroot=/tmp/chroot\r"
 expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
+        timeout {puts "TESTING ERROR 4\n";exit}
         "Child process initialized"
 }
 sleep 1
 
 send -- "ps aux | wc -l \r"
 expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
+        timeout {puts "TESTING ERROR 5\n";exit}
         "5"
 }
 after 100
diff --git a/test/features/1.6.exp b/test/features/1.6.exp
index a9c8f2a19..0a4b788b8 100755
--- a/test/features/1.6.exp
+++ b/test/features/1.6.exp
@@ -51,14 +51,14 @@ sleep 1
 #
 send -- "firejail --noprofile --chroot=/tmp/chroot\r"
 expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
+        timeout {puts "TESTING ERROR 4\n";exit}
         "Child process initialized"
 }
 sleep 1
 
 send -- "ls -l /var/log/syslog | wc -l\r"
 expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
+        timeout {puts "TESTING ERROR 5\n";exit}
         "0"
 }
 after 100
diff --git a/test/features/1.7.exp b/test/features/1.7.exp
index 0de3e224d..c95184fd1 100755
--- a/test/features/1.7.exp
+++ b/test/features/1.7.exp
@@ -53,14 +53,14 @@ sleep 1
 #
 send -- "firejail --noprofile --chroot=/tmp/chroot\r"
 expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
+        timeout {puts "TESTING ERROR 4\n";exit}
         "Child process initialized"
 }
 sleep 1
 
 send -- "ls -l /var/tmp/somefile | wc -l\r"
 expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
+        timeout {puts "TESTING ERROR 5\n";exit}
         "0"
 }
 after 100
diff --git a/test/features/1.8.exp b/test/features/1.8.exp
index 514dd3b81..aefe9d8c5 100755
--- a/test/features/1.8.exp
+++ b/test/features/1.8.exp
@@ -10,7 +10,6 @@ match_max 100000
 #
 # N
 #
-send -- "touch /var/tmp/somefile\r"
 sleep 1
 send -- "firejail --noprofile\r"
 expect {
@@ -19,10 +18,16 @@ expect {
 }
 sleep 1
 
-send -- "ls -l /var/tmp/somefile | wc -l\r"
+send -- "ls /etc/firejail\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
-        "0"
+        "Permission denied"
+}
+after 100
+send -- "ls ~/.config/firejail\r"
+expect {
+        timeout {puts "TESTING ERROR 1.1\n";exit}
+        "Permission denied"
 }
 after 100
 send -- "exit\r"
@@ -38,13 +43,19 @@ expect {
         "Child process initialized"
 }
 sleep 1
-
-send -- "ls -l /var/tmp/somefile | wc -l\r"
+send -- "ls /etc/firejail\r"
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
-        "0"
+        "Permission denied"
 }
 after 100
+send -- "ls ~/.config/firejail\r"
+expect {
+        timeout {puts "TESTING ERROR 3.1\n";exit}
+        "Permission denied"
+}
+after 100
+
 send -- "exit\r"
 sleep 1
 
@@ -53,15 +64,20 @@ sleep 1
 #
 send -- "firejail --noprofile --chroot=/tmp/chroot\r"
 expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
+        timeout {puts "TESTING ERROR 4\n";exit}
         "Child process initialized"
 }
 sleep 1
-
-send -- "ls -l /var/tmp/somefile | wc -l\r"
+send -- "ls /etc/firejail\r"
 expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
-        "0"
+        timeout {puts "TESTING ERROR 5\n";exit}
+        "Permission denied"
+}
+after 100
+send -- "ls ~/.config/firejail\r"
+expect {
+        timeout {puts "TESTING ERROR 5.1\n";exit}
+        "Permission denied"
 }
 after 100
 send -- "exit\r"
diff --git a/test/features/test.sh b/test/features/test.sh
index b4ef6503a..1fb7557c8 100755
--- a/test/features/test.sh
+++ b/test/features/test.sh
@@ -4,13 +4,13 @@
 # Feature testing
 #
 
-echo "TESTING: 1.1. new /boot"
+echo "TESTING: 1.1 new /boot"
 ./1.1.exp
 
-echo "TESTING: 1.2. new /proc"
+echo "TESTING: 1.2 new /proc"
 ./1.2.exp
 
-echo "TESTING: 1.5. PID namespace"
+echo "TESTING: 1.5 PID namespace"
 ./1.5.exp
 
 echo "TESTING: 1.6 new /var/log"
@@ -19,6 +19,6 @@ echo "TESTING: 1.6 new /var/log"
 echo "TESTING: 1.7 new /var/tmp"
 ./1.7.exp
 
-#echo "TESTING: "
-#./1..exp
+echo "TESTING: 1.8 disable /etc/firejail and ~/.config/firejail"
+./1.8.exp