testing

4 files changed, 83 insertions, 93 deletions

diff --git a/test/network/dns-print.exp b/test/network/dns-print.exp
new file mode 100755
index 000000000..9cdc14a6d
--- /dev/null
+++ b/test/network/dns-print.exp
@@ -0,0 +1,31 @@
+#!/usr/bin/expect -f
+
+set timeout 10
+spawn $env(SHELL)
+match_max 100000
+
+send --  "firejail --name=test-dns --net=eth0 --dns=1.2.3.4 --dns=2.3.4.5 --dns=3.4.5.6\r"
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "Child process initialized"
+}
+sleep 1
+
+spawn $env(SHELL)
+send --  "firejail --dns.print=test-dns\r"
+expect {
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "nameserver 1.2.3.4"
+}
+expect {
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "nameserver 2.3.4.5"
+}
+expect {
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "nameserver 3.4.5.6"
+}
+
+after 100
+
+puts "\nall done\n"
diff --git a/test/network/net_macvlan.exp b/test/network/net_macvlan.exp
deleted file mode 100755
index f457ea98f..000000000
--- a/test/network/net_macvlan.exp
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/expect -f
-# This file is part of Firejail project
-# Copyright (C) 2014-2016 Firejail Authors
-# License GPL v2
-
-set timeout 10
-spawn $env(SHELL)
-match_max 100000
-
-# check the existing address
-spawn $env(SHELL)
-send -- "firejail --net=eth0 --ip=192.168.1.60\r"
-expect {
-        timeout {puts "TESTING ERROR 1.1\n";puts "Please open a sandbox on 192.168.1.60\n";exit}
-        "the address 192.168.1.60 is already in use"
-}
-
-
-
-# grab 30 ip addresses
-set MAXi 229
-set i 200
-while { $i <= $MAXi } {
-        spawn $env(SHELL)
-        send -- "firejail --net=eth0 --ip=192.168.1.$i\r"
-        expect {
-                timeout {puts "TESTING ERROR 0\n";exit}
-                "Child process initialized"
-        }
-        incr i
-        after 100
-}
-
-
-# check an existing address
-spawn $env(SHELL)
-send -- "firejail --net=eth0 --ip=192.168.1.200\r"
-expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
-        "the address 192.168.1.200 is already in use"
-}
-
-
-set MAXi 254
-set i 2
-while { $i <= $MAXi } {
-        spawn $env(SHELL)
-        send -- "firejail --net=eth0\r"
-        expect {
-                timeout {puts "TESTING ERROR 2.1\n";exit}
-                "192.168.1.60" {puts "TESTING ERROR 2.2\n";exit}
-                "192.168.1.200" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.201" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.202" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.203" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.204" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.205" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.206" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.207" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.208" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.209" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.210" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.211" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.212" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.213" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.214" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.215" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.216" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.217" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.218" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.219" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.220" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.221" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.222" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.223" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.224" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.225" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.226" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.227" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.228" {puts "TESTING ERROR 3\n";exit}
-                "192.168.1.229" {puts "TESTING ERROR 3\n";exit}
-                "Child process initialized"
-        }
-        puts "************ $i ******************\n"
-        incr i
-        after 100
-#       sleep 1
-}
-send -- "exit\r"
-after 100
-
-puts "\n"
-
diff --git a/test/network/net_macvlan2.exp b/test/network/net_macvlan2.exp
new file mode 100755
index 000000000..7f21fc083
--- /dev/null
+++ b/test/network/net_macvlan2.exp
@@ -0,0 +1,43 @@
+#!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
+
+set timeout 10
+spawn $env(SHELL)
+match_max 100000
+
+send -- "firejail --net=eth0 --net=eth0 --net=eth0 --net=eth0\r"
+expect {
+        timeout {puts "TESTING ERROR 0.1\n";exit}
+        "eth0-"
+}
+expect {
+        timeout {puts "TESTING ERROR 0.2\n";exit}
+        "eth1-"
+}
+expect {
+        timeout {puts "TESTING ERROR 0.3\n";exit}
+        "eth2-"
+}
+expect {
+        timeout {puts "TESTING ERROR 0.4\n";exit}
+        "eth3-"
+}
+expect {
+        timeout {puts "TESTING ERROR 0.5\n";exit}
+        "Default gateway 192.168.1.1"
+}
+expect {
+        timeout {puts "TESTING ERROR 0.6\n";exit}
+        "Child process initialized"
+}
+after 100
+send -- "exit\r"
+sleep 1
+
+
+after 100
+
+puts "\nall done\n"
+
diff --git a/test/network/network.sh b/test/network/network.sh
index bea5dfb26..94df9935e 100755
--- a/test/network/network.sh
+++ b/test/network/network.sh
@@ -11,6 +11,9 @@ sudo ./configure
 echo "TESTING: firemon interface (firemon-interfaces.exp)"
 sudo ./firemon-interfaces.exp
 
+echo "TESTING: print dns (dns-print.exp)"
+./dns-print.exp
+
 echo "TESTING: firemon arp (firemon-arp.exp)"
 ./firemon-arp.exp
 
@@ -69,6 +72,9 @@ echo "TESTING: network default gateway test 3 (net_defaultgw3.exp)"
 echo "TESTING: scan (net_scan.exp)"
 ./net_scan.exp
 
+echo "TESTING: mtu (mtu.exp)"
+./mtu.exp
+
 echo "TESTING: interface (interface.exp)"
 ./interface.exp
 
@@ -84,6 +90,9 @@ echo "TESTING: iprange (iprange.exp)"
 echo "TESTING: veth-name (veth-name.exp)"
 ./veth-name.exp
 
+echo "TESTING: macvlan2 (net_macvlan2.exp)"
+./net_macvlan2.exp
+
 echo "TESTING: 4 bridges ARP (4bridges_arp.exp)"
 ./4bridges_arp.exp