netfilter split, --netfilter.print, --netfilter6.print

2 files changed, 17 insertions, 5 deletions

diff --git a/test/network/ip6.exp b/test/network/ip6.exp
index 26780e167..c55f690db 100755
--- a/test/network/ip6.exp
+++ b/test/network/ip6.exp
@@ -10,7 +10,7 @@ match_max 100000
 send -- "firejail --debug --noprofile --net=br0 --ip6=2001:0db8:0:f101::1/64 --netfilter6=ipv6.net\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Installing network filter"
+        "Installing IPv6 firewall"
 }
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
@@ -46,10 +46,12 @@ send -- "exit\r"
 sleep 2
 
 
+
+
 send -- "firejail --debug --profile=ip6.profile\r"
 expect {
         timeout {puts "TESTING ERROR 10\n";exit}
-        "Installing network filter"
+        "Installing IPv6 firewall"
 }
 expect {
         timeout {puts "TESTING ERROR 11\n";exit}
@@ -82,7 +84,17 @@ expect {
 }
 
 send -- "exit\r"
+sleep 2
 
+send -- "firejail --debug --netfilter6=ipv6.net\r"
+expect {
+        timeout {puts "TESTING ERROR 11\n";exit}
+        "Installing IPv6 firewall" {puts "TESTING ERROR 12\n";exit}
+        "Child process initialized"
+}
 after 100
+send -- "exit\r"
 
+
+after 100
 puts "\nall done\n"
diff --git a/test/network/net_netfilter.exp b/test/network/net_netfilter.exp
index 52fd3bf11..8f371bafc 100755
--- a/test/network/net_netfilter.exp
+++ b/test/network/net_netfilter.exp
@@ -11,7 +11,7 @@ match_max 100000
 send -- "firejail --debug --noprofile --net=br0 --ip=10.10.20.5 --netfilter\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Installing network filter"
+        "Installing firewall"
 }
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
@@ -51,7 +51,7 @@ sleep 1
 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"
+        "Installing firewall"
 }
 expect {
         timeout {puts "TESTING ERROR 6.1\n";exit}
@@ -71,7 +71,7 @@ sleep 1
 send -- "firejail --debug --net=br0 --ip=10.10.20.5 --profile=netfilter.profile\r"
 expect {
         timeout {puts "TESTING ERROR 7\n";exit}
-        "Installing network filter"
+        "Installing firewall"
 }
 expect {
         timeout {puts "TESTING ERROR 7.1\n";exit}