Changeset 81

Timestamp:

03/03/2005 11:35:27 AM (4 years ago)

Author:

jan

Message:

skip fastcgi checks if fastcgi-proc is not available

Location:

trunk/tests

Files:

• mod-fastcgi.t (modified) (4 diffs)
• mod-userdir.t (modified) (1 diff)

trunk/tests/mod-fastcgi.t

@@ -26 +26 @@
         close F;
 
-        return $pid;
+        if (defined $pid) { return $pid; }
+
+        return -1;
 }
 
@@ -34 +36 @@
         close F;
 
-        kill('TERM',$pid) or return -1;
-        select(undef, undef, undef, 0.01);
+        if (defined $pid) {
+                kill('TERM',$pid) or return -1;
+                select(undef, undef, undef, 0.01);
+        }
 
         return 0;
@@ -196 +200 @@
 }
     
-ok(start_proc == 0, "Starting lighttpd") or die();
 
 SKIP: {
-        skip "no PHP running on port 1026", 13 if pidof("php") == -1; 
+        skip "no PHP running on port 1026", 23 if pidof("php") == -1; 
+
+        ok(start_proc == 0, "Starting lighttpd") or die();
 
         @request  = ( <<EOF
@@ -302 +307 @@
         ok(handle_http == 0, 'PHP_SELF + Indexfile, Bug #3');
 
-
-}
-
-$configfile = 'fastcgi-10.conf';
-ok(start_proc == 0, "Starting lighttpd with $configfile") or die();
-@request  = ( <<EOF
+        
+        ok(stop_proc == 0, "Stopping lighttpd");
+
+
+        $configfile = 'fastcgi-10.conf';
+        ok(start_proc == 0, "Starting lighttpd with $configfile") 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-auth.conf';
-ok(start_proc == 0, "Starting lighttpd with $configfile") or die();
-@request  = ( <<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 = 'bug-06.conf';
+        ok(start_proc == 0, "Starting lighttpd with $configfile") 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");
+}
+
+SKIP: {
+        skip "no fcgi-auth found", 4 unless -x $basedir."/tests/fcgi-auth"; 
+
+        $configfile = 'fastcgi-auth.conf';
+        ok(start_proc == 0, "Starting lighttpd with $configfile") 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');
-
-@request  = ( <<EOF
+        @response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } );
+        ok(handle_http == 0, 'FastCGI - Auth');
+
+        @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 $configfile") or die();
-@request  = ( <<EOF
+        @response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 403 } );
+        ok(handle_http == 0, 'FastCGI - Auth');
+
+        ok(stop_proc == 0, "Stopping lighttpd");
+}
+
+SKIP: {
+        skip "no fcgi-auth found", 3 unless -x "/home/weigon/Documents/php-4.3.10/sapi/cgi/php"; 
+        $configfile = 'fastcgi-13.conf';
+        ok(start_proc == 0, "Starting lighttpd with $configfile") 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 $configfile") 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");
-
-$configfile = 'fastcgi-responder.conf';
-ok(start_proc == 0, "Starting lighttpd with $configfile") or die();
-@request  = ( <<EOF
+        @response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } );
+        ok(handle_http == 0, 'FastCGI + local spawning');
+
+        ok(stop_proc == 0, "Stopping lighttpd");
+}
+
+
+SKIP: {
+        skip "no fcgi-auth found", 9 unless -x $basedir."/tests/fcgi-responder"; 
+        
+        $configfile = 'fastcgi-responder.conf';
+        ok(start_proc == 0, "Starting lighttpd with $configfile") or die();
+        @request  = ( <<EOF
 GET /index.fcgi?lf HTTP/1.0
 Host: www.example.org
 EOF
  );
-@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'test123' } );
-ok(handle_http == 0, 'line-ending \n\n');
-
-@request  = ( <<EOF
+        @response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'test123' } );
+        ok(handle_http == 0, 'line-ending \n\n');
+
+        @request  = ( <<EOF
 GET /index.fcgi?crlf HTTP/1.0
 Host: www.example.org
 EOF
  );
-@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'test123' } );
-ok(handle_http == 0, 'line-ending \r\n\r\n');
-
-@request  = ( <<EOF
+        @response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'test123' } );
+        ok(handle_http == 0, 'line-ending \r\n\r\n');
+
+        @request  = ( <<EOF
 GET /index.fcgi?slow-lf HTTP/1.0
 Host: www.example.org
 EOF
  );
-@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'test123' } );
-ok(handle_http == 0, 'line-ending \n + \n');
-
-@request  = ( <<EOF
+        @response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'test123' } );
+        ok(handle_http == 0, 'line-ending \n + \n');
+
+        @request  = ( <<EOF
 GET /index.fcgi?slow-crlf HTTP/1.0
 Host: www.example.org
 EOF
  );
-@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'test123' } );
-ok(handle_http == 0, 'line-ending \r\n + \r\n');
-
-@request  = ( <<EOF
+        @response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'test123' } );
+        ok(handle_http == 0, 'line-ending \r\n + \r\n');
+
+        @request  = ( <<EOF
 GET /index.fcgi?die-at-end HTTP/1.0
 Host: www.example.org
 EOF
  );
-@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'test123' } );
-ok(handle_http == 0, 'killing fastcgi and wait for restart');
-
-@request  = ( <<EOF
+        @response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'test123' } );
+        ok(handle_http == 0, 'killing fastcgi and wait for restart');
+
+        @request  = ( <<EOF
 GET /index.fcgi?die-at-end HTTP/1.0
 Host: www.example.org
 EOF
  );
-@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'test123' } );
-ok(handle_http == 0, 'killing fastcgi and wait for restart');
-
-
-@request  = ( <<EOF
+        @response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'test123' } );
+        ok(handle_http == 0, 'killing fastcgi and wait for restart');
+
+
+        @request  = ( <<EOF
 GET /index.fcgi?crlf HTTP/1.0
 Host: www.example.org
 EOF
  );
-@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'test123' } );
-ok(handle_http == 0, 'regular response of after restart');
-
-
-
-ok(stop_proc == 0, "Stopping lighttpd");
-
+        @response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'test123' } );
+        ok(handle_http == 0, 'regular response of after restart');
+
+
+        ok(stop_proc == 0, "Stopping lighttpd");
+}
+

trunk/tests/mod-userdir.t

@@ -192 +192 @@
 
 @request  = ( <<EOF
-GET /~jan/ HTTP/1.0
+GET /~foobar/ HTTP/1.0
 EOF
  );