httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r330356 - in /httpd/test/trunk/perl-framework/t: apache/ modules/ security/ ssl/
Date Wed, 02 Nov 2005 20:44:18 GMT
Author: stas
Date: Wed Nov  2 12:44:13 2005
New Revision: 330356

URL: http://svn.apache.org/viewcvs?rev=330356&view=rev
Log:
tests requiring LWP when LWP is not available are now skipped

Modified:
    httpd/test/trunk/perl-framework/t/apache/acceptpathinfo.t
    httpd/test/trunk/perl-framework/t/apache/post.t
    httpd/test/trunk/perl-framework/t/modules/alias.t
    httpd/test/trunk/perl-framework/t/modules/include.t
    httpd/test/trunk/perl-framework/t/modules/vhost_alias.t
    httpd/test/trunk/perl-framework/t/security/CVE-2005-2700.t
    httpd/test/trunk/perl-framework/t/ssl/basicauth.t
    httpd/test/trunk/perl-framework/t/ssl/env.t
    httpd/test/trunk/perl-framework/t/ssl/headers.t
    httpd/test/trunk/perl-framework/t/ssl/http.t
    httpd/test/trunk/perl-framework/t/ssl/proxy.t
    httpd/test/trunk/perl-framework/t/ssl/require.t
    httpd/test/trunk/perl-framework/t/ssl/v2.t
    httpd/test/trunk/perl-framework/t/ssl/varlookup.t
    httpd/test/trunk/perl-framework/t/ssl/verify.t

Modified: httpd/test/trunk/perl-framework/t/apache/acceptpathinfo.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/apache/acceptpathinfo.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/apache/acceptpathinfo.t (original)
+++ httpd/test/trunk/perl-framework/t/apache/acceptpathinfo.t Wed Nov  2 12:44:13 2005
@@ -23,7 +23,7 @@
 push @files, "/test.sh" if ($havecgi);
 
 my $numtests = ((scalar keys %tests) * (scalar @files) * 4);
-plan tests => $numtests, sub { need_apache(2) && need_module('include') };
+plan tests => $numtests, need need_apache(2), need_module('include'), need_lwp;
 
 my $loc = "/apache/acceptpathinfo";
 

Modified: httpd/test/trunk/perl-framework/t/apache/post.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/apache/post.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/apache/post.t (original)
+++ httpd/test/trunk/perl-framework/t/apache/post.t Wed Nov  2 12:44:13 2005
@@ -7,6 +7,6 @@
 my $module = 'eat_post';
 my $num = Apache::TestCommon::run_post_test_sizes();
 
-plan tests => $num, [$module];
+plan tests => $num, need need_lwp, need_module($module);
 
 Apache::TestCommon::run_post_test($module);

Modified: httpd/test/trunk/perl-framework/t/modules/alias.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/modules/alias.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/modules/alias.t (original)
+++ httpd/test/trunk/perl-framework/t/modules/alias.t Wed Nov  2 12:44:13 2005
@@ -40,7 +40,7 @@
             (keys %rm_rc) * 10 + 12 + $script_tests;
 
 #LWP required to follow redirects
-plan tests => $tests, [qw(alias LWP)];
+plan tests => $tests, need need_module('alias'), need_lwp;
 
 ## simple alias ##
 t_debug "verifying simple aliases";

Modified: httpd/test/trunk/perl-framework/t/modules/include.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/modules/include.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/modules/include.t (original)
+++ httpd/test/trunk/perl-framework/t/modules/include.t Wed Nov  2 12:44:13 2005
@@ -213,7 +213,7 @@
 
 plan tests => (scalar keys %tests) + @patterns + 32,
               todo => \@todo,
-              have_module 'include';
+              need need_lwp, need_module 'include';
 
 foreach $doc (sort keys %tests) {
     # do as much from %test as we can

Modified: httpd/test/trunk/perl-framework/t/modules/vhost_alias.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/modules/vhost_alias.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/modules/vhost_alias.t (original)
+++ httpd/test/trunk/perl-framework/t/modules/vhost_alias.t Wed Nov  2 12:44:13 2005
@@ -14,7 +14,7 @@
 
 my @vh = qw(www.vha-test.com big.server.name.from.heck.org ab.com w-t-f.net);
 
-plan tests => @vh * 2, sub { need_module('vhost_alias') && need_cgi() };
+plan tests => @vh * 2, need need_module('vhost_alias'), need_cgi, need_lwp;
 
 Apache::TestRequest::scheme('http'); #ssl not listening on this vhost
 Apache::TestRequest::module('mod_vhost_alias'); #use this module's port

Modified: httpd/test/trunk/perl-framework/t/security/CVE-2005-2700.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/security/CVE-2005-2700.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/security/CVE-2005-2700.t (original)
+++ httpd/test/trunk/perl-framework/t/security/CVE-2005-2700.t Wed Nov  2 12:44:13 2005
@@ -7,7 +7,8 @@
 
 my $vars = Apache::Test::vars();
 
-plan tests => 2, [$vars->{ssl_module_name}, qw(LWP::Protocol::https)];
+plan tests => 2, need $vars->{ssl_module_name}, need_lwp,
+    qw(LWP::Protocol::https);
 
 Apache::TestRequest::user_agent_keepalive(0);
 Apache::TestRequest::scheme('https');

Modified: httpd/test/trunk/perl-framework/t/ssl/basicauth.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/ssl/basicauth.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/basicauth.t (original)
+++ httpd/test/trunk/perl-framework/t/ssl/basicauth.t Wed Nov  2 12:44:13 2005
@@ -13,7 +13,7 @@
 
 my $url = '/ssl-fakebasicauth/index.html';
 
-plan tests => 3, \&need_auth;
+plan tests => 3, need need_auth, need_lwp;
 
 Apache::TestRequest::scheme('https');
 

Modified: httpd/test/trunk/perl-framework/t/ssl/env.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/ssl/env.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/env.t (original)
+++ httpd/test/trunk/perl-framework/t/ssl/env.t Wed Nov  2 12:44:13 2005
@@ -20,7 +20,7 @@
 my $url = '/ssl-cgi/env.pl';
 
 my $tests = (keys(%$server_expect) + keys(%$client_expect)) * 2;
-plan tests => $tests, \&need_cgi;
+plan tests => $tests, need need_cgi, need_lwp;
 
 Apache::TestRequest::scheme('https');
 

Modified: httpd/test/trunk/perl-framework/t/ssl/headers.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/ssl/headers.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/headers.t (original)
+++ httpd/test/trunk/perl-framework/t/ssl/headers.t Wed Nov  2 12:44:13 2005
@@ -7,7 +7,7 @@
 
 my $tests = 3;
 
-plan tests => $tests, need_module('headers', 'ssl');
+plan tests => $tests, need need_lwp, need_module('headers', 'ssl');
 
 Apache::TestRequest::scheme('https');
 

Modified: httpd/test/trunk/perl-framework/t/ssl/http.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/ssl/http.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/http.t (original)
+++ httpd/test/trunk/perl-framework/t/ssl/http.t Wed Nov  2 12:44:13 2005
@@ -22,7 +22,7 @@
     @todo = (todo => [2]);
 }
 
-plan tests => 2, @todo;
+plan tests => 2, @todo, need_lwp;
 
 my $config = Apache::Test::config();
 my $ssl_module = $config->{vars}->{ssl_module_name};

Modified: httpd/test/trunk/perl-framework/t/ssl/proxy.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/ssl/proxy.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/proxy.t (original)
+++ httpd/test/trunk/perl-framework/t/ssl/proxy.t Wed Nov  2 12:44:13 2005
@@ -31,7 +31,7 @@
 }
 
 plan tests => (8 + $post_tests) * $num_modules - 5 * $num_http_backends,
-              [qw(mod_proxy proxy_http.c)];
+              need need_lwp, [qw(mod_proxy proxy_http.c)];
 
 for my $module (sort keys %frontend) {
 

Modified: httpd/test/trunk/perl-framework/t/ssl/require.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/ssl/require.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/require.t (original)
+++ httpd/test/trunk/perl-framework/t/ssl/require.t Wed Nov  2 12:44:13 2005
@@ -10,7 +10,7 @@
 #happen in real-life, so just disable keepalives here.
 Apache::TestRequest::user_agent_keepalive(0);
 
-plan tests => 5;
+plan tests => 5, need_lwp;
 
 Apache::TestRequest::scheme('https');
 

Modified: httpd/test/trunk/perl-framework/t/ssl/v2.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/ssl/v2.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/v2.t (original)
+++ httpd/test/trunk/perl-framework/t/ssl/v2.t Wed Nov  2 12:44:13 2005
@@ -8,7 +8,7 @@
 use Apache::Test;
 use Apache::TestRequest;
 
-plan tests => 1;
+plan tests => 1, need_lwp;
 
 Apache::TestRequest::scheme('https');
 

Modified: httpd/test/trunk/perl-framework/t/ssl/varlookup.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/ssl/varlookup.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/varlookup.t (original)
+++ httpd/test/trunk/perl-framework/t/ssl/varlookup.t Wed Nov  2 12:44:13 2005
@@ -6,6 +6,11 @@
 use Apache::TestUtil;
 use Apache::TestSSLCA qw(dn dn_oneline);
 
+unless (have_lwp) {
+    # bail out early, since the parser below relies on $LWP::VERSION
+    plan tests => 0, need_lwp;
+}
+
 use Time::localtime;
 
 my $config = Apache::Test::config();
@@ -66,7 +71,7 @@
     push @vars, $key;
 }
 
-plan tests => scalar @vars, need_module 'test_ssl';
+plan tests => scalar (@vars), need need_lwp, need_module('test_ssl');
 
 for my $key (@vars) {
     sok { verify($key); };

Modified: httpd/test/trunk/perl-framework/t/ssl/verify.t
URL: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/t/ssl/verify.t?rev=330356&r1=330355&r2=330356&view=diff
==============================================================================
--- httpd/test/trunk/perl-framework/t/ssl/verify.t (original)
+++ httpd/test/trunk/perl-framework/t/ssl/verify.t Wed Nov  2 12:44:13 2005
@@ -13,7 +13,7 @@
 
 my $url = '/verify/index.html';
 
-plan tests => 3;
+plan tests => 3, need_lwp;
 
 Apache::TestRequest::scheme('https');
 



Mime
View raw message