testing

6 files changed, 45 insertions, 54 deletions

diff --git a/test/firemon-caps.exp b/test/firemon-caps.exp
index 547d04c02..3dd6384db 100755
--- a/test/firemon-caps.exp
+++ b/test/firemon-caps.exp
@@ -4,7 +4,7 @@ set timeout 10
 spawn $env(SHELL)
 match_max 100000
 
-send --  "firejail --name=bingo1 --caps\r"
+send --  "firejail --name=bingo1 --noprofile --caps\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "Child process initialized"
@@ -12,33 +12,33 @@ expect {
 sleep 1
 
 spawn $env(SHELL)
-send --  "firejail --name=bingo2\r"
+send --  "firejail --name=bingo2 --noprofile\r"
 expect {
-        timeout {puts "TESTING ERROR 0\n";exit}
+        timeout {puts "TESTING ERROR 1\n";exit}
         "Child process initialized"
 }
 sleep 1
 
 spawn $env(SHELL)
-send --  "firejail --name=bingo3 --caps.drop=all\r"
+send --  "firejail --name=bingo3 --noprofile --caps.drop=all\r"
 expect {
-        timeout {puts "TESTING ERROR 0\n";exit}
+        timeout {puts "TESTING ERROR 2\n";exit}
         "Child process initialized"
 }
 sleep 1
 
 spawn $env(SHELL)
-send --  "firejail --name=bingo4 --caps.drop=chown,kill\r"
+send --  "firejail --noprofile --name=bingo4 --caps.drop=chown,kill\r"
 expect {
-        timeout {puts "TESTING ERROR 0\n";exit}
+        timeout {puts "TESTING ERROR 3\n";exit}
         "Child process initialized"
 }
 sleep 1
 
 spawn $env(SHELL)
-send --  "firejail --name=bingo5 --caps.keep=chown,kill\r"
+send --  "firejail --noprofile --name=bingo5 --caps.keep=chown,kill\r"
 expect {
-        timeout {puts "TESTING ERROR 0\n";exit}
+        timeout {puts "TESTING ERROR 4\n";exit}
         "Child process initialized"
 }
 sleep 1
@@ -46,7 +46,7 @@ sleep 1
 spawn $env(SHELL)
 send --  "firejail --name=bingo6 --profile=caps1.profile\r"
 expect {
-        timeout {puts "TESTING ERROR 0\n";exit}
+        timeout {puts "TESTING ERROR 5\n";exit}
         "Child process initialized"
 }
 sleep 1
@@ -59,77 +59,68 @@ expect {
 }
 sleep 1
 
-
-
-
 spawn $env(SHELL)
 send -- "firemon --caps\r"
 expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
+        timeout {puts "TESTING ERROR 8.1\n";exit}
         "bingo1"
 }
 expect {
-        timeout {puts "TESTING ERROR 2\n";exit}
+        timeout {puts "TESTING ERROR 8.2\n";exit}
         "31cffff"
 }
 expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
+        timeout {puts "TESTING ERROR 8.3\n";exit}
         "bingo2"
 }
 expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
+        timeout {puts "TESTING ERROR 8.4\n";exit}
         "fffffff"
 }
 expect {
-        timeout {puts "TESTING ERROR 5\n";exit}
+        timeout {puts "TESTING ERROR 8.5\n";exit}
         "bingo3"
 }
 expect {
-        timeout {puts "TESTING ERROR 6\n";exit}
+        timeout {puts "TESTING ERROR 8.6\n";exit}
         "000000000000"
 }
 
 expect {
-        timeout {puts "TESTING ERROR 7\n";exit}
+        timeout {puts "TESTING ERROR 8.7\n";exit}
         "bingo4"
 }
 expect {
-        timeout {puts "TESTING ERROR 8\n";exit}
+        timeout {puts "TESTING ERROR 8.8\n";exit}
         "ffffffde"
 }
 expect {
-        timeout {puts "TESTING ERROR 7\n";exit}
+        timeout {puts "TESTING ERROR 8.9\n";exit}
         "bingo5"
 }
 expect {
-        timeout {puts "TESTING ERROR 9\n";exit}
+        timeout {puts "TESTING ERROR 8.10\n";exit}
         "0000000000000021"
 }
 
 expect {
-        timeout {puts "TESTING ERROR 10\n";exit}
+        timeout {puts "TESTING ERROR 8.11\n";exit}
         "bingo6"
 }
 expect {
-        timeout {puts "TESTING ERROR 11\n";exit}
+        timeout {puts "TESTING ERROR 8.12\n";exit}
         "ffffffde"
 }
 expect {
-        timeout {puts "TESTING ERROR 12\n";exit}
+        timeout {puts "TESTING ERROR 8.13\n";exit}
         "bingo7"
 }
 expect {
-        timeout {puts "TESTING ERROR 13\n";exit}
+        timeout {puts "TESTING ERROR 8.14\n";exit}
         "0000000000000021"
 }
 
+after 100
 
-
-
-
-
-
-sleep 1
-
-puts "\n"
+puts "all done\n"
 
diff --git a/test/firemon-seccomp.exp b/test/firemon-seccomp.exp
index 0cf53b690..55817faf3 100755
--- a/test/firemon-seccomp.exp
+++ b/test/firemon-seccomp.exp
@@ -4,7 +4,7 @@ set timeout 10
 spawn $env(SHELL)
 match_max 100000
 
-send --  "firejail --name=bingo1 --seccomp\r"
+send --  "firejail --noprofile --name=bingo1 --seccomp\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "Child process initialized"
@@ -12,9 +12,9 @@ expect {
 sleep 1
 
 spawn $env(SHELL)
-send --  "firejail --name=bingo2\r"
+send --  "firejail --noprofile --name=bingo2\r"
 expect {
-        timeout {puts "TESTING ERROR 0\n";exit}
+        timeout {puts "TESTING ERROR 0.1\n";exit}
         "Child process initialized"
 }
 sleep 1
@@ -40,6 +40,6 @@ expect {
         timeout {puts "TESTING ERROR 3\n";exit}
         "Seccomp:       0"
 }
-sleep 1
+after 100
 
-puts "\n"
+puts "all done\n"
diff --git a/test/net_local.exp b/test/net_local.exp
index 9302ec4ef..032c0427d 100755
--- a/test/net_local.exp
+++ b/test/net_local.exp
@@ -5,7 +5,7 @@ spawn $env(SHELL)
 match_max 100000
 
 # check ip address
-send -- "firejail --debug\r"
+send -- "firejail --noprofile --debug\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "Using the local network stack"
@@ -19,7 +19,7 @@ send -- "exit\r"
 sleep 2
 
 # check loopback
-send -- "firejail\r"
+send -- "firejail --noprofile\r"
 expect {
         timeout {puts "TESTING ERROR 9\n";exit}
         "Child process initialized"
@@ -45,5 +45,5 @@ expect {
         "UP"
 }
 
-puts "\n"
+puts "all done\n"
 
diff --git a/test/net_netfilter.exp b/test/net_netfilter.exp
index 8583d4625..989fcc407 100755
--- a/test/net_netfilter.exp
+++ b/test/net_netfilter.exp
@@ -5,7 +5,7 @@ spawn $env(SHELL)
 match_max 100000
 
 # check default netfilter on br0
-send -- "firejail --debug --net=br0 --ip=10.10.20.5 --netfilter\r"
+send -- "firejail --debug --noprofile --net=br0 --ip=10.10.20.5 --netfilter\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "Installing network filter"
@@ -31,7 +31,7 @@ send -- "exit\r"
 sleep 1
 
 # check default netfilter no new network
-send -- "firejail --debug --netfilter\r"
+send -- "firejail --debug --noprofile --netfilter\r"
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
         "Installing network filter" {puts "TESTING ERROR 5.1\n";exit}
@@ -45,7 +45,7 @@ send -- "exit\r"
 sleep 1
 
 # check file filter netfilter on br0
-send -- "firejail --debug --net=br0 --ip=10.10.20.5 --netfilter=netfilter.filter\r"
+send -- "firejail --debug --noprofile --net=br0 --ip=10.10.20.5 --netfilter=netfilter.filter\r"
 expect {
         timeout {puts "TESTING ERROR 6\n";exit}
         "Installing network filter"
@@ -82,7 +82,7 @@ expect {
 }
 
 send -- "exit\r"
-sleep 1
+after 100
 
-puts "\n"
+puts "all done\n"
 
diff --git a/test/net_noip.exp b/test/net_noip.exp
index 3db67885d..8d28adb39 100755
--- a/test/net_noip.exp
+++ b/test/net_noip.exp
@@ -5,7 +5,7 @@ spawn $env(SHELL)
 match_max 100000
 
 # check ip address
-send -- "firejail --net=br0 --ip=none\r"
+send -- "firejail --noprofile --net=br0 --ip=none\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "eth0" {puts "TESTING ERROR 1\n";exit}
@@ -35,7 +35,7 @@ expect {
         timeout {puts "TESTING ERROR 6\n";exit}
         "home"
 }
-sleep 1
+after 100
 
-puts "\n"
+puts "all done\n"
 
diff --git a/test/net_noip2.exp b/test/net_noip2.exp
index 234aec8a8..58f90422b 100755
--- a/test/net_noip2.exp
+++ b/test/net_noip2.exp
@@ -5,7 +5,7 @@ spawn $env(SHELL)
 match_max 100000
 
 # check ip address
-send -- "firejail --net=br1 --ip=none --defaultgw=10.10.30.78\r"
+send -- "firejail --noprofile --net=br1 --ip=none --defaultgw=10.10.30.78\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "eth0" {puts "TESTING ERROR 1\n";exit}
@@ -35,7 +35,7 @@ expect {
         timeout {puts "TESTING ERROR 6\n";exit}
         "home"
 }
-sleep 1
+after 100
 
-puts "\n"
+puts "all done\n"