networking features testing

33 files changed, 18 insertions, 79 deletions

diff --git a/test/4bridges_arp.exp b/test/network/4bridges_arp.exp
index 6a3e6db2a..6a3e6db2a 100755
--- a/test/4bridges_arp.exp
+++ b/test/network/4bridges_arp.exp
diff --git a/test/4bridges_ip.exp b/test/network/4bridges_ip.exp
index 8068aeebb..8068aeebb 100755
--- a/test/4bridges_ip.exp
+++ b/test/network/4bridges_ip.exp
diff --git a/test/bandwidth.exp b/test/network/bandwidth.exp
index 33b351296..33b351296 100755
--- a/test/bandwidth.exp
+++ b/test/network/bandwidth.exp
diff --git a/test/hostname.exp b/test/network/hostname.exp
index 4e5c7e073..4e5c7e073 100755
--- a/test/hostname.exp
+++ b/test/network/hostname.exp
diff --git a/test/ip6.exp b/test/network/ip6.exp
index fba47d095..fba47d095 100755
--- a/test/ip6.exp
+++ b/test/network/ip6.exp
diff --git a/test/ipv6.net b/test/network/ipv6.net
index cc8f22943..cc8f22943 100644
--- a/test/ipv6.net
+++ b/test/network/ipv6.net
diff --git a/test/net-profile.profile b/test/network/net-profile.profile
index 05052b6dc..05052b6dc 100644
--- a/test/net-profile.profile
+++ b/test/network/net-profile.profile
diff --git a/test/net_arp.exp b/test/network/net_arp.exp
index 9e07744f3..9e07744f3 100755
--- a/test/net_arp.exp
+++ b/test/network/net_arp.exp
diff --git a/test/net_badip.exp b/test/network/net_badip.exp
index 71b69e104..71b69e104 100755
--- a/test/net_badip.exp
+++ b/test/network/net_badip.exp
diff --git a/test/net_defaultgw.exp b/test/network/net_defaultgw.exp
index 840f2ccac..840f2ccac 100755
--- a/test/net_defaultgw.exp
+++ b/test/network/net_defaultgw.exp
diff --git a/test/net_defaultgw2.exp b/test/network/net_defaultgw2.exp
index db14e17cb..db14e17cb 100755
--- a/test/net_defaultgw2.exp
+++ b/test/network/net_defaultgw2.exp
diff --git a/test/net_defaultgw3.exp b/test/network/net_defaultgw3.exp
index 64da9dfca..64da9dfca 100755
--- a/test/net_defaultgw3.exp
+++ b/test/network/net_defaultgw3.exp
diff --git a/test/net_interface.exp b/test/network/net_interface.exp
index 4b55187ff..4b55187ff 100755
--- a/test/net_interface.exp
+++ b/test/network/net_interface.exp
diff --git a/test/net_ip.exp b/test/network/net_ip.exp
index f5d487ecc..f5d487ecc 100755
--- a/test/net_ip.exp
+++ b/test/network/net_ip.exp
diff --git a/test/net_local.exp b/test/network/net_local.exp
index 642213658..642213658 100755
--- a/test/net_local.exp
+++ b/test/network/net_local.exp
diff --git a/test/net_mac.exp b/test/network/net_mac.exp
index 076634730..076634730 100755
--- a/test/net_mac.exp
+++ b/test/network/net_mac.exp
diff --git a/test/net_macvlan.exp b/test/network/net_macvlan.exp
index 20d022de9..20d022de9 100755
--- a/test/net_macvlan.exp
+++ b/test/network/net_macvlan.exp
diff --git a/test/net_mtu.exp b/test/network/net_mtu.exp
index 7943b2866..7943b2866 100755
--- a/test/net_mtu.exp
+++ b/test/network/net_mtu.exp
diff --git a/test/net_netfilter.exp b/test/network/net_netfilter.exp
index 989fcc407..989fcc407 100755
--- a/test/net_netfilter.exp
+++ b/test/network/net_netfilter.exp
diff --git a/test/net_noip.exp b/test/network/net_noip.exp
index 8d28adb39..8d28adb39 100755
--- a/test/net_noip.exp
+++ b/test/network/net_noip.exp
diff --git a/test/net_noip2.exp b/test/network/net_noip2.exp
index 58f90422b..58f90422b 100755
--- a/test/net_noip2.exp
+++ b/test/network/net_noip2.exp
diff --git a/test/net_none.exp b/test/network/net_none.exp
index 54b6cb946..54b6cb946 100755
--- a/test/net_none.exp
+++ b/test/network/net_none.exp
diff --git a/test/net_none.profile b/test/network/net_none.profile
index 079c08ea8..079c08ea8 100644
--- a/test/net_none.profile
+++ b/test/network/net_none.profile
diff --git a/test/net_profile.exp b/test/network/net_profile.exp
index 37043c906..37043c906 100755
--- a/test/net_profile.exp
+++ b/test/network/net_profile.exp
diff --git a/test/netfilter.filter b/test/network/netfilter.filter
index 3e232065c..3e232065c 100644
--- a/test/netfilter.filter
+++ b/test/network/netfilter.filter
diff --git a/test/netfilter.profile b/test/network/netfilter.profile
index 824c6cd0f..824c6cd0f 100644
--- a/test/netfilter.profile
+++ b/test/network/netfilter.profile
diff --git a/test/profile_followlnk.exp b/test/profiles/profile_followlnk.exp
index e2ede2865..4d89de26b 100755
--- a/test/profile_followlnk.exp
+++ b/test/profiles/profile_followlnk.exp
@@ -5,34 +5,22 @@ spawn $env(SHELL)
 match_max 100000
 
 send -- "mkdir /tmp/firejailtestdir\r"
-sleep 1
 send -- "ln -s /tmp/firejailtestdir  /tmp/firejailtestdirlnk\r"
-sleep 1
 send -- "touch /tmp/firejailtestfile\r"
-sleep 1
 send -- "ln -s /tmp/firejailtestfile /tmp/firejailtestfilelnk\r"
 sleep 1
 
-send -- "firejail --profile=readonly-lnk.profile --debug\r"
+send -- "firejail --profile=readonly-lnk.profile\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "Child process initialized"
 }
 
-# testing private only
-send -- "bash\r"
-sleep 1
-
-
-send -- "ls > /tmp/firejailtestdirlnk/ttt;pwd\r"
+send -- "ls > /tmp/firejailtestdirlnk/ttt\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
         "Read-only file system"
 }
-expect {
-        timeout {puts "TESTING ERROR 1.1\n";exit}
-        "home"
-}
 sleep 1
 
 send -- "ls > /tmp/firejailtestfilelnk;pwd\r"
@@ -40,29 +28,10 @@ expect {
         timeout {puts "TESTING ERROR 2\n";exit}
         "Read-only file system"
 }
-expect {
-        timeout {puts "TESTING ERROR 2.1\n";exit}
-        "home"
-}
 sleep 1
 
 send -- "exit\r"
-sleep 1
-send -- "pwd\r"
-expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
-        "home"
-}
-sleep 1
-send -- "exit\r"
-sleep 1
-send -- "pwd\r"
-expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
-        "home"
-}
-sleep 2
 send -- "rm -fr /tmp/firejailtest*\r"
 sleep 1
 
-puts "\n"
+puts "\nall done\n"
diff --git a/test/profile_noperm.exp b/test/profiles/profile_noperm.exp
index b3ed558bc..25ec580bd 100755
--- a/test/profile_noperm.exp
+++ b/test/profiles/profile_noperm.exp
@@ -10,4 +10,4 @@ expect {
         "cannot access profile"
 }
 sleep 1
-puts "\n"
+puts "\nall done\n"
diff --git a/test/profile_readonly.exp b/test/profiles/profile_readonly.exp
index 046b0d738..e8e78d6ad 100755
--- a/test/profile_readonly.exp
+++ b/test/profiles/profile_readonly.exp
@@ -5,7 +5,6 @@ spawn $env(SHELL)
 match_max 100000
 
 send -- "mkdir /tmp/firejailtestdir\r"
-sleep 1
 send -- "touch /tmp/firejailtestfile\r"
 sleep 1
 
@@ -14,51 +13,24 @@ expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "Child process initialized"
 }
+sleep 2
 
-# testing private only
-send -- "bash\r"
-sleep 1
-
-
-send -- "ls > /tmp/firejailtestdir/ttt;pwd\r"
+send -- "ls > /tmp/firejailtestdir/ttt\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
         "Read-only file system"
 }
-expect {
-        timeout {puts "TESTING ERROR 1.1\n";exit}
-        "home"
-}
 sleep 1
 
-send -- "ls > /tmp/firejailtestfile;pwd\r"
+send -- "ls > /tmp/firejailtestfile\r"
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
         "Read-only file system"
 }
-expect {
-        timeout {puts "TESTING ERROR 2.1\n";exit}
-        "home"
-}
-sleep 1
-
-send -- "exit\r"
-sleep 1
-send -- "pwd\r"
-expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
-        "home"
-}
-sleep 1
 send -- "exit\r"
 sleep 1
-send -- "pwd\r"
-expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
-        "home"
-}
-sleep 2
+
 send -- "rm -fr /tmp/firejailtest*\r"
 sleep 1
 
-puts "\n"
+puts "\nall done\n"
diff --git a/test/profiles/profiles.sh b/test/profiles/profiles.sh
index e3adc8a4f..ca0b9fb29 100755
--- a/test/profiles/profiles.sh
+++ b/test/profiles/profiles.sh
@@ -23,3 +23,12 @@ echo "TESTING: profile syntax 2 (test/profiles/profile_syntax2.exp)"
 echo "TESTING: ignore command (test/profiles/ignore.exp)"
 ./ignore.exp
 
+echo "TESTING: profile read-only (test/profiles/profile_readonly.exp)"
+./profile_readonly.exp
+
+echo "TESTING: profile read-only links (test/profiles/profile_readonly.exp)"
+./profile_followlnk.exp
+
+echo "TESTING: profile no permissions (test/profiles/profile_noperm.exp)"
+./profile_noperm.exp
+
diff --git a/test/readonly-lnk.profile b/test/profiles/readonly-lnk.profile
index 71ffb1a26..71ffb1a26 100644
--- a/test/readonly-lnk.profile
+++ b/test/profiles/readonly-lnk.profile
diff --git a/test/readonly.profile b/test/profiles/readonly.profile
index 55d89e3d7..55d89e3d7 100644
--- a/test/readonly.profile
+++ b/test/profiles/readonly.profile
diff --git a/test/test.sh b/test/test.sh
index 0509afdfb..9d7dba4fa 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -7,11 +7,6 @@
 
 ./fscheck.sh
 
-echo "TESTING: network profile (net_profile.exp)"
-./net_profile.exp
-
-echo "TESTING: bandwidth (bandwidth.exp)"
-./bandwidth.exp
 
 echo "TESTING: protocol.print (protocol-print.exp)"
 ./protocol-print.exp
@@ -127,12 +122,6 @@ echo "TESTING: PID (pid.exp)"
 echo "TESTING: output (output.exp)"
 ./output.exp
 
-echo "TESTING: profile no permissions (profile_noperm.exp)"
-./profile_noperm.exp
-
-echo "TESTING: profile read-only (profile_readonly.exp)"
-./profile_readonly.exp
-
 echo "TESTING: private (private.exp)"
 ./private.exp `whoami`