testing

6 files changed, 22 insertions, 25 deletions

diff --git a/test/fscheck-shell.exp b/test/fscheck-shell.exp
index 548955e60..6a3b5829c 100755
--- a/test/fscheck-shell.exp
+++ b/test/fscheck-shell.exp
@@ -37,12 +37,12 @@ expect {
 after 100
 
 # file link
-send -- "firejail --net=br0 --shell=fscheck-file-link\r"
-expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
-        "Error"
-}
-after 100
+#send -- "firejail --net=br0 --shell=fscheck-file-link\r"
+#expect {
+#       timeout {puts "TESTING ERROR 4\n";exit}
+#       "Error"
+#}
+#after 100
 
 # ..
 send -- "firejail --net=br0 --shell=../test/fscheck-file-link\r"
diff --git a/test/ip6.exp b/test/ip6.exp
index 4dc11d3dc..19a822ee2 100755
--- a/test/ip6.exp
+++ b/test/ip6.exp
@@ -14,30 +14,26 @@ expect {
         "DROP"
 }
 expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
-        "DROP"
-}
-expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
-        "2001:db8:1f0a:3ec::2/128"
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "2001:db8:1f0a:3ec::2"
 }
 expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
+        timeout {puts "TESTING ERROR 3\n";exit}
         "Child process initialized"
 }
 sleep 2
 
 send -- "/sbin/ifconfig\r"
 expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
+        timeout {puts "TESTING ERROR 4\n";exit}
         "inet6 addr"
 }
 expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
+        timeout {puts "TESTING ERROR 5\n";exit}
         "2001:db8:0:f101::1/64"
 }
 expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
+        timeout {puts "TESTING ERROR 6\n";exit}
         "Scope:Global"
 }
 
diff --git a/test/name.profile b/test/name.profile
index 69e605600..1aa9f2d64 100644
--- a/test/name.profile
+++ b/test/name.profile
@@ -1 +1 @@
-name svntesting
+name jointesting
diff --git a/test/option-join-profile.exp b/test/option-join-profile.exp
index 8f9c10bf7..9200980a1 100755
--- a/test/option-join-profile.exp
+++ b/test/option-join-profile.exp
@@ -12,16 +12,16 @@ expect {
 sleep 3
 
 spawn $env(SHELL)
-send --  "firejail --join=svntesting;pwd\r"
+send --  "firejail --join=jointesting;pwd\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
         "Switching to pid"
 }
-sleep 1
+sleep 3
 
 
 spawn $env(SHELL)
-send --  "firejail --shutdown=svntesting;pwd\r"
+send --  "firejail --shutdown=jointesting;pwd\r"
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
         "home"
@@ -31,7 +31,7 @@ sleep 5
 send --  "firejail --list;pwd\r"
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
-        "svntesting" {puts "TESTING ERROR 5\n";exit}
+        "jointesting" {puts "TESTING ERROR 5\n";exit}
         "home"
 }
 sleep 1
diff --git a/test/option-shutdown.exp b/test/option-shutdown.exp
index 260a5b84f..e869f7611 100755
--- a/test/option-shutdown.exp
+++ b/test/option-shutdown.exp
@@ -4,7 +4,7 @@ set timeout 10
 spawn $env(SHELL)
 match_max 100000
 
-send --  "firejail --name=svntesting\r"
+send --  "firejail --name=shutdowntesting\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "Child process initialized"
@@ -12,7 +12,7 @@ expect {
 sleep 3
 
 spawn $env(SHELL)
-send --  "firejail --shutdown=svntesting;pwd\r"
+send --  "firejail --shutdown=shutdowntesting;pwd\r"
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
         "home"
@@ -22,9 +22,9 @@ sleep 1
 send --  "firejail --list;pwd\r"
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
-        "svntesting" {puts "TESTING ERROR 6\n";exit}
+        "shutdowntesting" {puts "TESTING ERROR 6\n";exit}
         "home"
 }
 sleep 1
 
-puts "\n"
+puts "\nalldone\n"
diff --git a/test/test.sh b/test/test.sh
index 2c051d13b..98addc38a 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -272,6 +272,7 @@ echo "TESTING: network IP"
 ./net_ip.exp
 
 echo "TESTING: network MAC"
+sleep 2
 ./net_mac.exp
 
 echo "TESTING: network MTU"