Changeset 56

Timestamp:

02/28/2005 05:08:05 PM (4 years ago)

Author:

jan

Message:

converted all tests to run-tests.pl

Location:

trunk/tests

Files:

• Makefile.am (modified) (1 diff)
• accessdeny-01.sh (deleted)
• bug-03.sh (deleted)
• bug-06.sh (deleted)
• bug-12.sh (deleted)
• bug-14.sh (deleted)
• bug-15-2.sh (deleted)
• bug-15-3.sh (deleted)
• bug-15.sh (deleted)
• bug-urldecode-00.sh (deleted)
• compress-01.sh (deleted)
• compress-02.sh (deleted)
• compress-03.sh (deleted)
• compress-04.sh (deleted)
• docroot/www/Makefile.am (modified) (1 diff)
• docroot/www/expire (added)
• docroot/www/expire/Makefile.am (added)
• docroot/www/expire/access.txt (added)
• docroot/www/expire/modification.txt (added)
• fastcgi-01.sh (deleted)
• fastcgi-02.sh (deleted)
• fastcgi-03.sh (deleted)
• fastcgi-04.sh (deleted)
• fastcgi-05.sh (deleted)
• fastcgi-06.sh (deleted)
• fastcgi-07.sh (deleted)
• fastcgi-08.sh (deleted)
• fastcgi-09.sh (deleted)
• fastcgi-10.sh (deleted)
• fastcgi-11.sh (deleted)
• fastcgi-12.sh (deleted)
• fastcgi-13.sh (deleted)
• head-01.sh (deleted)
• large-header-01.sh (deleted)
• lighttpd.conf (modified) (5 diffs)
• pathinfo-01.sh (deleted)
• pathinfo-02.sh (deleted)
• prepare.sh (modified) (2 diffs)
• run-tests.pl (modified) (6 diffs)

trunk/tests/Makefile.am

@@ -12 +12 @@
 prepare.sh \
 run-tests.pl \
-bug-03.sh \
-bug-06.sh \
-bug-12.sh \
-large-header-01.sh \
-compress-01.sh \
-compress-02.sh \
-compress-03.sh \
-compress-04.sh \
-fastcgi-10.sh \
-fastcgi-11.sh \
-fastcgi-12.sh \
-fastcgi-13.sh \
 cleanup.sh
 

trunk/tests/docroot/www/Makefile.am

@@ -2 +2 @@
            phpself.php redirect.php cgi-pathinfo.pl phphost.php  \
            nph-status.pl
-SUBDIRS=go indexfile
+SUBDIRS=go indexfile expire

trunk/tests/lighttpd.conf

@@ -4 +4 @@
 ## bind to port (default: 80)
 server.port                 = 2048
-
-# server.license              = "00000001000000013feccb804014587f000000010000000105911c976a3d462c8eaa2d7ca850432c"
 
 ## bind to localhost (default: all interfaces)
@@ -14 +12 @@
 
 fastcgi.debug = 1
-
-## 
-## Format: <errorfile-prefix><status>.html
-## -> ..../status-404.html for 'File not found'
-#server.errorfile-prefix    = "/home/weigon/projects/lighttpd/doc/status-"
 
 server.dir-listing          = "enable"
@@ -46 +39 @@
 server.indexfiles           = ( "index.php", "index.html", 
                                 "index.htm", "default.htm" )
-
-#,-- only root can use these options
-#|
-#|# chroot() to directory (default: no chroot() )
-#| server.chroot  /
-#|# change uid to <uid> (default: don't care)
-#| server.userid wwwrun
-#|# change uid to <uid> (default: don't care)
-#| server.groupid wwwrun
-#|
-#`-- 
 
 
@@ -103 +85 @@
                                 ".py"  => "/usr/bin/python" )
                         
-userdir.include-user = ( "weigon" )
+userdir.include-user = ( "jan" )
 userdir.path = "/"
 
@@ -144 +126 @@
 url.redirect                = ( "^/redirect/$" => "http://localhost:2048/" )
 
-expire.url                  = ( "/buggy/" => "access 2 hours", "/asdhas/" => "access plus 1 seconds 2 minutes")
+expire.url                  = ( "/expire/access" => "access 2 hours", 
+                                "/expire/modification" => "access plus 1 seconds 2 minutes")
 
 #cache.cache-dir             = "/home/weigon/wwwroot/cache/"

trunk/tests/prepare.sh

@@ -12 +12 @@
 mkdir -p $tmpdir/servers/www.example.org/pages/dummydir/
 mkdir -p $tmpdir/servers/www.example.org/pages/go/
+mkdir -p $tmpdir/servers/www.example.org/pages/expire/
 mkdir -p $tmpdir/servers/www.example.org/pages/indexfile/
 mkdir -p $tmpdir/servers/123.example.org/pages/
@@ -24 +25 @@
    $srcdir/docroot/www/*.txt $tmpdir/servers/www.example.org/pages/
 cp $srcdir/docroot/www/go/*.php $tmpdir/servers/www.example.org/pages/go/
+cp $srcdir/docroot/www/expire/*.txt $tmpdir/servers/www.example.org/pages/expire/
 cp $srcdir/docroot/www/indexfile/*.php $tmpdir/servers/www.example.org/pages/indexfile/
 cp $srcdir/docroot/123/*.txt \

trunk/tests/run-tests.pl

@@ -3 +3 @@
 use strict;
 use IO::Socket;
-use Test::More tests => 89;
+use Test::More tests => 114;
 
 
@@ -33 +33 @@
 
         kill('TERM',$pid) or return -1;
+        select(undef, undef, undef, 0.25);
 
         return 0;
@@ -166 +167 @@
 
                         if (!defined $resp_hdr{$k}) {
-                                diag(sprintf("required header '%s' is missing\n", $_));
+                                diag(sprintf("required header '%s' is missing\n", $k));
                                 return -1;
                         }
@@ -747 +748 @@
 
 
+@request  = ( <<EOF
+GET / HTTP/1.0
+Hsgfsdjf: asdfhdf
+hdhd: shdfhfdasd
+hfhr: jfghsdfg
+jfuuehdmn: sfdgjfdg
+jvcbzufdg: sgfdfg
+hrnvcnd: jfjdfg
+jfusfdngmd: gfjgfdusdfg
+nfj: jgfdjdfg
+jfue: jfdfdg
+EOF
+ );
+@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } );
+ok(handle_http == 0, 'larger headers');
+
 
 
@@ -942 +959 @@
 
 
+
+print "\nmodules - mod_compress\n";
+@request  = ( <<EOF
+GET /index.html HTTP/1.0
+Accept-Encoding: deflate
+EOF
+ );
+@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, '+Vary' => '' } );
+ok(handle_http == 0, 'Vary is set');
+
+@request  = ( <<EOF
+GET /index.html HTTP/1.0
+Accept-Encoding: deflate
+EOF
+ );
+@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, '+Vary' => '', 'Content-Length' => '1288', '+Content-Encoding' => '' } );
+ok(handle_http == 0, 'deflate - Content-Length and Content-Encoding is set');
+
+@request  = ( <<EOF
+GET /index.html HTTP/1.0
+Accept-Encoding: gzip
+EOF
+ );
+@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, '+Vary' => '', '+Content-Encoding' => '' } );
+ok(handle_http == 0, 'gzip - Content-Length and Content-Encoding is set');
+
+@request  = ( <<EOF
+GET /index.txt HTTP/1.0
+Accept-Encoding: gzip, deflate
+EOF
+ );
+@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, '+Vary' => '', '+Content-Encoding' => '' } );
+ok(handle_http == 0, 'gzip, deflate - Content-Length and Content-Encoding is set');
+
+
+print "\nmodules - mod_expire\n";
+@request  = ( <<EOF
+GET /expire/access.txt HTTP/1.0
+EOF
+ );
+@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, '+Expires' => '' } );
+ok(handle_http == 0, 'access');
+
+@request  = ( <<EOF
+GET /expire/modification.txt HTTP/1.0
+EOF
+ );
+@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, '+Expires' => '' } );
+ok(handle_http == 0, 'modification');
+
+
+
+
+
+
 print "\nmodules - mod_userdir\n";
 
@@ -968 +1040 @@
 ok(handle_http == 0, 'valid user + redirect');
 
-
-
-
-
-
 print "\nclean up\n";
 
 ok(stop_proc == 0, "Stopping lighttpd");
 
-
+print "\nspecial config\n";
+
+$configfile = 'fastcgi-10.conf';
+ok(start_proc == 0, "Starting lighttpd with fastcgi-10.conf") or die();
+@request  = ( <<EOF
+GET /phphost.php HTTP/1.0
+Host: zzz.example.org
+EOF
+ );
+@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'zzz.example.org' } );
+ok(handle_http == 0, 'FastCGI + Host');
+
+ok(stop_proc == 0, "Stopping lighttpd");
+
+$configfile = 'fastcgi-11.conf';
+ok(start_proc == 0, "Starting lighttpd with fastcgi-11.conf") or die();
+@request  = ( <<EOF
+GET /index.html?ok HTTP/1.0
+Host: www.example.org
+EOF
+ );
+@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } );
+ok(handle_http == 0, 'FastCGI - Auth');
+
+ok(stop_proc == 0, "Stopping lighttpd");
+
+$configfile = 'fastcgi-12.conf';
+ok(start_proc == 0, "Starting lighttpd with fastcgi-12.conf") or die();
+@request  = ( <<EOF
+GET /index.html?fail HTTP/1.0
+Host: www.example.org
+EOF
+ );
+@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 403 } );
+ok(handle_http == 0, 'FastCGI - Auth');
+
+ok(stop_proc == 0, "Stopping lighttpd");
+
+$configfile = 'fastcgi-13.conf';
+ok(start_proc == 0, "Starting lighttpd with fastcgi-13.conf") or die();
+@request  = ( <<EOF
+GET /indexfile/index.php HTTP/1.0
+Host: www.example.org
+EOF
+ );
+@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } );
+ok(handle_http == 0, 'FastCGI + local spawning');
+
+ok(stop_proc == 0, "Stopping lighttpd");
+
+$configfile = 'bug-06.conf';
+ok(start_proc == 0, "Starting lighttpd with bug-06.conf") or die();
+@request  = ( <<EOF
+GET /indexfile/ HTTP/1.0
+Host: www.example.org
+EOF
+ );
+@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => '/indexfile/index.php' } );
+ok(handle_http == 0, 'Bug #6');
+
+ok(stop_proc == 0, "Stopping lighttpd");
+
+$configfile = 'bug-12.conf';
+ok(start_proc == 0, "Starting lighttpd with bug-12.conf") or die();
+@request  = ( <<EOF
+POST /indexfile/abc HTTP/1.0
+Host: www.example.org
+Content-Length: 0
+EOF
+ );
+@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 404, 'HTTP-Content' => '/indexfile/return-404.php' } );
+ok(handle_http == 0, 'Bug #12');
+
+ok(stop_proc == 0, "Stopping lighttpd");
+
+