diff options
-rwxr-xr-x | test/servers3.exp | 9 | ||||
-rwxr-xr-x | test/servers6.exp | 9 | ||||
-rwxr-xr-x | test/test-root.sh | 9 | ||||
-rwxr-xr-x | test/test.sh | 3 |
4 files changed, 22 insertions, 8 deletions
diff --git a/test/servers3.exp b/test/servers3.exp index 20a20a88d..eccdaa1d9 100755 --- a/test/servers3.exp +++ b/test/servers3.exp | |||
@@ -45,7 +45,7 @@ expect { | |||
45 | send -- "cat index.html\r" | 45 | send -- "cat index.html\r" |
46 | expect { | 46 | expect { |
47 | timeout {puts "TESTING ERROR 4\n";exit} | 47 | timeout {puts "TESTING ERROR 4\n";exit} |
48 | "This is the default web page for this server" | 48 | "DOCTYPE html PUBLIC" |
49 | } | 49 | } |
50 | 50 | ||
51 | sleep 1 | 51 | sleep 1 |
@@ -63,6 +63,13 @@ expect { | |||
63 | "ppp" {puts "TESTING ERROR 6\n";exit} | 63 | "ppp" {puts "TESTING ERROR 6\n";exit} |
64 | "log" | 64 | "log" |
65 | } | 65 | } |
66 | sleep 1 | ||
67 | send -- "ls -al /tmp;pwd\r" | ||
68 | expect { | ||
69 | timeout {puts "TESTING ERROR 10\n";exit} | ||
70 | "X11-unix" {puts "TESTING ERROR 11\n";exit} | ||
71 | "/root" | ||
72 | } | ||
66 | sleep 2 | 73 | sleep 2 |
67 | 74 | ||
68 | puts "\nall done\n" | 75 | puts "\nall done\n" |
diff --git a/test/servers6.exp b/test/servers6.exp index 2179f6f98..9ef4ea514 100755 --- a/test/servers6.exp +++ b/test/servers6.exp | |||
@@ -45,7 +45,7 @@ expect { | |||
45 | send -- "cat index.html\r" | 45 | send -- "cat index.html\r" |
46 | expect { | 46 | expect { |
47 | timeout {puts "TESTING ERROR 4\n";exit} | 47 | timeout {puts "TESTING ERROR 4\n";exit} |
48 | "Welcome to nginx" | 48 | "DOCTYPE html PUBLIC" |
49 | } | 49 | } |
50 | 50 | ||
51 | sleep 1 | 51 | sleep 1 |
@@ -63,6 +63,13 @@ expect { | |||
63 | "ppp" {puts "TESTING ERROR 6\n";exit} | 63 | "ppp" {puts "TESTING ERROR 6\n";exit} |
64 | "log" | 64 | "log" |
65 | } | 65 | } |
66 | sleep 1 | ||
67 | send -- "ls -al /tmp;pwd\r" | ||
68 | expect { | ||
69 | timeout {puts "TESTING ERROR 10\n";exit} | ||
70 | "X11-unix" {puts "TESTING ERROR 11\n";exit} | ||
71 | "/root" | ||
72 | } | ||
66 | sleep 2 | 73 | sleep 2 |
67 | 74 | ||
68 | puts "\nall done\n" | 75 | puts "\nall done\n" |
diff --git a/test/test-root.sh b/test/test-root.sh index 66096f33a..ee3b7aeb2 100755 --- a/test/test-root.sh +++ b/test/test-root.sh | |||
@@ -5,6 +5,9 @@ | |||
5 | echo "TESTING: tmpfs" | 5 | echo "TESTING: tmpfs" |
6 | ./option_tmpfs.exp | 6 | ./option_tmpfs.exp |
7 | 7 | ||
8 | echo "TESTING: profile tmpfs" | ||
9 | ./profile_tmpfs.exp | ||
10 | |||
8 | echo "TESTING: network interfaces" | 11 | echo "TESTING: network interfaces" |
9 | ./net_interface.exp | 12 | ./net_interface.exp |
10 | 13 | ||
@@ -19,7 +22,7 @@ fi | |||
19 | 22 | ||
20 | if [ -f /etc/init.d/apache2 ] | 23 | if [ -f /etc/init.d/apache2 ] |
21 | then | 24 | then |
22 | echo "TESTING: servers apache2, private-dev" | 25 | echo "TESTING: servers apache2, private-dev, private-tmp" |
23 | ./servers3.exp | 26 | ./servers3.exp |
24 | fi | 27 | fi |
25 | 28 | ||
@@ -31,13 +34,13 @@ fi | |||
31 | 34 | ||
32 | if [ -f /etc/init.d/unbound ] | 35 | if [ -f /etc/init.d/unbound ] |
33 | then | 36 | then |
34 | echo "TESTING: servers unbound, private-dev" | 37 | echo "TESTING: servers unbound, private-dev, private-tmp" |
35 | ./servers5.exp | 38 | ./servers5.exp |
36 | fi | 39 | fi |
37 | 40 | ||
38 | if [ -f /etc/init.d/nginx ] | 41 | if [ -f /etc/init.d/nginx ] |
39 | then | 42 | then |
40 | echo "TESTING: servers nginx, private-dev" | 43 | echo "TESTING: servers nginx, private-dev, private-tmp" |
41 | ./servers6.exp | 44 | ./servers6.exp |
42 | fi | 45 | fi |
43 | 46 | ||
diff --git a/test/test.sh b/test/test.sh index 985b43af0..ad6599848 100755 --- a/test/test.sh +++ b/test/test.sh | |||
@@ -175,9 +175,6 @@ echo "TESTING: profile rlimit" | |||
175 | echo "TESTING: profile read-only" | 175 | echo "TESTING: profile read-only" |
176 | ./profile_readonly.exp | 176 | ./profile_readonly.exp |
177 | 177 | ||
178 | echo "TESTING: profile tmpfs" | ||
179 | ./profile_tmpfs.exp | ||
180 | |||
181 | echo "TESTING: private" | 178 | echo "TESTING: private" |
182 | ./private.exp `whoami` | 179 | ./private.exp `whoami` |
183 | 180 | ||