servers testing

5 files changed, 106 insertions, 31 deletions

diff --git a/test/servers2.exp b/test/servers2.exp
index 28bcae207..90e34470f 100755
--- a/test/servers2.exp
+++ b/test/servers2.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 
-set timeout 10
+set timeout 5
 spawn $env(SHELL)
 match_max 100000
 
@@ -10,22 +10,48 @@ expect {
         "root"
 }
 
-send --  "firejail --net=br0 --ip=10.10.20.5--seccomp\r"
+send -- "pkill snmpd\r"
+sleep 2
+
+
+send -- "firejail --name=snmpd /etc/init.d/snmpd start\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "Child process initialized"
 }
 sleep 2
 
-send -- "/etc/init.d/snmpd start"
+spawn $env(SHELL)
+send -- "firejail --tree\r"
+expect {
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "snmp:/usr/sbin/snmpd"
+}
 sleep 2
 
-send -- "ps aux; pwd\r"
+send -- "tail /var/log/syslog\r"
 expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
+        timeout {puts "TESTING ERROR 3\n";exit}
         "snmpd"
 }
+expect {
+        timeout {puts "TESTING ERROR 4\n";exit}
+        "NET-SNMP version"
+}
 
-send -- "exit\r"
-sleep 1
-puts "\n"
+send -- "firejail --join=snmpd\r"
+sleep 2
+
+send -- "ls /dev\r"
+expect {
+        timeout {puts "TESTING ERROR 5\n";exit}
+        "tty0" {puts "TESTING ERROR 6\n";exit}
+        "ttyS0" {puts "TESTING ERROR 6\n";exit}
+        "audio" {puts "TESTING ERROR 6\n";exit}
+        "ppp" {puts "TESTING ERROR 6\n";exit}
+        "log"
+}
+sleep 2
+
+sleep 2
+puts "\nall done\n"
diff --git a/test/servers3.exp b/test/servers3.exp
index da44a28ee..20a20a88d 100755
--- a/test/servers3.exp
+++ b/test/servers3.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 
-set timeout 10
+set timeout 5
 spawn $env(SHELL)
 match_max 100000
 
@@ -10,37 +10,59 @@ expect {
         "root"
 }
 
-send --  "firejail --net=br0 --ip=10.10.20.5 --seccomp\r"
+send -- "pkill apache\r"
+sleep 2
+
+
+send -- "firejail --name=apache /etc/init.d/apache2 start\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "Child process initialized"
 }
 sleep 2
 
-send -- "/etc/init.d/apache2 start\r"
-sleep 2
 
-send -- "ps aux; pwd\r"
+spawn $env(SHELL)
+send -- "firejail --tree\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
-        "apache"
+        "root:/usr/sbin/apache2"
 }
+expect {
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "www-data:/usr/sbin/apache2"
+}
+sleep 2
+
 
 send -- "rm index.html\r"
 sleep 1
 send -- "wget 0\r"
 expect {
-        timeout {puts "TESTING ERROR 2\n";exit}
+        timeout {puts "TESTING ERROR 3\n";exit}
         "saved"
 }
 send -- "cat index.html\r"
 expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
+        timeout {puts "TESTING ERROR 4\n";exit}
         "This is the default web page for this server"
 }
 
+sleep 1
+send -- "rm index.html\r"
+
+send -- "firejail --join=apache\r"
+sleep 2
 
+send -- "ls /dev\r"
+expect {
+        timeout {puts "TESTING ERROR 5\n";exit}
+        "tty0" {puts "TESTING ERROR 6\n";exit}
+        "ttyS0" {puts "TESTING ERROR 6\n";exit}
+        "audio" {puts "TESTING ERROR 6\n";exit}
+        "ppp" {puts "TESTING ERROR 6\n";exit}
+        "log"
+}
+sleep 2
 
-send -- "exit\r"
-sleep 1
 puts "\nall done\n"
diff --git a/test/servers4.exp b/test/servers4.exp
index 9feeecf61..86500707a 100755
--- a/test/servers4.exp
+++ b/test/servers4.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 
-set timeout 10
+set timeout 5
 spawn $env(SHELL)
 match_max 100000
 
@@ -10,23 +10,49 @@ expect {
         "root"
 }
 
-send --  "firejail --net=br0 --ip=10.10.20.5 --seccomp\r"
+send -- "pkill dhcpd\r"
+sleep 2
+
+send -- "firejail --name=dhcpd /etc/init.d/isc-dhcp-server start\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "Child process initialized"
 }
 sleep 2
 
-send -- "/etc/init.d/isc-dhcp-server start\r"
-sleep 5
+spawn $env(SHELL)
+send -- "firejail --tree\r"
+expect {
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "root:/usr/sbin/dhcpd"
+}
+sleep 2
+
+send -- "tail -n 200 /var/log/syslog\r"
+expect {
+        timeout {puts "TESTING ERROR 3\n";exit}
+        "Internet Systems Consortium DHCP Server"
+}
+expect {
+        timeout {puts "TESTING ERROR 4\n";exit}
+        "Wrote 0 leases to leases file"
+}
+sleep 2
 
+send -- "firejail --join=dhcpd\r"
+sleep 2
 
-send -- "ps aux; pwd\r"
+send -- "ls /dev\r"
 expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
-        "dhcpd"
+        timeout {puts "TESTING ERROR 5\n";exit}
+        "tty0" {puts "TESTING ERROR 6\n";exit}
+        "ttyS0" {puts "TESTING ERROR 6\n";exit}
+        "ppp" {puts "TESTING ERROR 6\n";exit}
+        "audio" {puts "TESTING ERROR 6\n";exit}
+        "log"
 }
+sleep 2
+
+
+puts "\nall done\n"
 
-send -- "exit\r"
-sleep 1
-puts "\n"
diff --git a/test/servers5.exp b/test/servers5.exp
index 68c986cbb..193e662ff 100755
--- a/test/servers5.exp
+++ b/test/servers5.exp
@@ -48,6 +48,7 @@ expect {
         "tty0" {puts "TESTING ERROR 6\n";exit}
         "ttyS0" {puts "TESTING ERROR 6\n";exit}
         "audio" {puts "TESTING ERROR 6\n";exit}
+        "ppp" {puts "TESTING ERROR 6\n";exit}
         "log"
 }
 sleep 2
diff --git a/test/test-root.sh b/test/test-root.sh
index 69a594e85..43bf84bfe 100755
--- a/test/test-root.sh
+++ b/test/test-root.sh
@@ -13,19 +13,19 @@ echo "TESTING: servers rsyslogd, sshd, nginx"
 
 if [ -f /etc/init.d/snmpd ]
 then
-        echo "TESTING: servers snmpd"
+        echo "TESTING: servers snmpd, private-dev"
         ./servers2.exp
 fi
 
 if [ -f /etc/init.d/apache2 ]
 then
-        echo "TESTING: servers apache2"
+        echo "TESTING: servers apache2, private-dev"
         ./servers3.exp
 fi
 
 if [ -f /etc/init.d/isc-dhcp-server ]
 then
-        echo "TESTING: servers isc dhcp server"
+        echo "TESTING: servers isc dhcp server, private-dev"
         ./servers4.exp
 fi