fixing some of the tests

3 files changed, 31 insertions, 44 deletions

diff --git a/test/fs/mkdir_mkfile.exp b/test/fs/mkdir_mkfile.exp
index 109984035..82dab1ddf 100755
--- a/test/fs/mkdir_mkfile.exp
+++ b/test/fs/mkdir_mkfile.exp
@@ -22,23 +22,23 @@ expect {
         "_firejail_test_dir"
 }
 expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
+        timeout {puts "TESTING ERROR 2\n";exit}
         "_firejail_test_dir/dir1"
 }
 expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
+        timeout {puts "TESTING ERROR 3\n";exit}
         "_firejail_test_dir/dir1/dir2"
 }
 expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
+        timeout {puts "TESTING ERROR 4\n";exit}
         "_firejail_test_dir/dir1/dir2/dir3"
 }
 expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
+        timeout {puts "TESTING ERROR 5\n";exit}
         "_firejail_test_dir/dir1/dir2/dir3/file1"
 }
 expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
+        timeout {puts "TESTING ERROR 6\n";exit}
         "_firejail_test_file"
 }
 after 100
@@ -47,8 +47,8 @@ after 100
 
 send -- "firejail --profile=mkfile.profile\r"
 expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
-        "only files in user home or /tmp"
+        timeout {puts "TESTING ERROR 7\n";exit}
+        "only files or directories in user home, /tmp"
 }
 after 100
 
diff --git a/test/utils/build.exp b/test/utils/build.exp
index ae46ffa6e..ac4f30326 100755
--- a/test/utils/build.exp
+++ b/test/utils/build.exp
@@ -7,22 +7,21 @@ set timeout 10
 spawn $env(SHELL)
 match_max 100000
 
+send -- "echo testing > ~/firejail-test-file-7699\r"
+after 100
+
 send -- "firejail --build cat ~/firejail-test-file-7699\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "whitelist ~/firejail-test-file-7699"
-}
-expect {
-        timeout {puts "TESTING ERROR 0.1\n";exit}
-        "include /etc/firejail/whitelist-common.inc"
+        "whitelist $\{HOME\}/firejail-test-file-7699"
 }
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
-        "private-tmp"
+        "include whitelist-common.inc"
 }
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
-        "private-dev"
+        "blacklist /usr/share"
 }
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
@@ -34,26 +33,40 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
-        "caps.drop all"
+        "private-dev"
 }
 expect {
         timeout {puts "TESTING ERROR 6\n";exit}
-        "nonewprivs"
+        "private-etc"
 }
 expect {
         timeout {puts "TESTING ERROR 7\n";exit}
-        "seccomp"
+        "private-tmp"
 }
 expect {
         timeout {puts "TESTING ERROR 8\n";exit}
-        "net none"
+        "caps.drop all"
 }
 expect {
         timeout {puts "TESTING ERROR 9\n";exit}
+        "nonewprivs"
+}
+expect {
+        timeout {puts "TESTING ERROR 10\n";exit}
+        "seccomp"
+}
+expect {
+        timeout {puts "TESTING ERROR 11\n";exit}
+        "net none"
+}
+expect {
+        timeout {puts "TESTING ERROR 12\n";exit}
         "shell none"
 }
 after 100
 
+
+
 send -- "firejail --build cat /etc/passwd\r"
 expect {
         timeout {puts "TESTING ERROR 10\n";exit}
@@ -72,21 +85,6 @@ expect {
 }
 after 100
 
-
-#send -- "firejail --build cat /var/tmp/firejail-test-file-7699\r"
-#expect {
-#       timeout {puts "TESTING ERROR 11\n";exit}
-#       "whitelist /var/tmp/firejail-test-file-7699"
-#}
-#after 100
-
-#send -- "firejail --build man firejail\r"
-#expect {
-#       timeout {puts "TESTING ERROR 12\n";exit}
-#       "whitelist /usr/share/man"
-#}
-#after 100
-
 send -- "firejail --build wget --output-document=~ debian.org\r"
 expect {
         timeout {puts "TESTING ERROR 13\n";exit}
@@ -98,10 +96,4 @@ expect {
 }
 after 100
 
-
-send -- "firejail --build cat /tmp/firejail-test-file-7699\r"
-#todo - bug: it comes back with private-tmp
-sleep 1
-
-
 puts "all done\n"
diff --git a/test/utils/utils.sh b/test/utils/utils.sh
index 82ccc82bb..48a8051fa 100755
--- a/test/utils/utils.sh
+++ b/test/utils/utils.sh
@@ -13,14 +13,9 @@ if [ -f /etc/debian_version ]; then
 fi
 export PATH="$PATH:/usr/lib/firejail:/usr/lib64/firejail"
 
-echo "testing" > ~/firejail-test-file-7699
-echo "testing" > /tmp/firejail-test-file-7699
-echo "testing" > /var/tmp/firejail-test-file-7699
 echo "TESTING: build (test/utils/build.exp)"
 ./build.exp
 rm -f ~/firejail-test-file-7699
-rm -f /tmp/firejail-test-file-7699
-rm -f /var/tmp/firejail-test-file-7699
 rm -f firejail-test-file-4388
 
 if [ $(readlink /proc/self) -lt 100 ]; then