stas 2004/09/28 15:43:42
Modified: t/filter both_str_con_add.t
t/protocol echo_block.t echo_filter.t pseudo_http.t
Log:
blocking socket bug fixed in 2.0.52, add a skip rule for that
Revision Changes Path
1.6 +5 -2 modperl-2.0/t/filter/both_str_con_add.t
Index: both_str_con_add.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/filter/both_str_con_add.t,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- both_str_con_add.t 9 Jul 2004 15:52:26 -0000 1.5
+++ both_str_con_add.t 28 Sep 2004 22:43:42 -0000 1.6
@@ -1,13 +1,16 @@
use strict;
use warnings FATAL => 'all';
-use Test;
+use Apache::Test;
use Apache::TestUtil;
use Apache::TestRequest ();
my @test_strings = qw(MODPERL 2.0 RULES);
-plan tests => 1 + @test_strings;
+# blocking socket bug fixed in 2.0.52
+my $ok = $^O !~ /^(Open|Net)BSD$/i || need_min_apache_version('2.0.52');
+
+plan tests => 1 + @test_strings, $ok;
my $module = "TestFilter::both_str_con_add";
my $socket = Apache::TestRequest::vhost_socket($module);
1.3 +5 -2 modperl-2.0/t/protocol/echo_block.t
Index: echo_block.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/protocol/echo_block.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- echo_block.t 9 Jul 2004 21:48:13 -0000 1.2
+++ echo_block.t 28 Sep 2004 22:43:42 -0000 1.3
@@ -1,13 +1,16 @@
use strict;
use warnings FATAL => 'all';
-use Test;
+use Apache::Test;
use Apache::TestUtil;
use Apache::TestRequest ();
my @test_strings = qw(hello world);
-plan tests => 1 + @test_strings;
+# blocking socket bug fixed in 2.0.52
+my $ok = $^O !~ /^(Open|Net)BSD$/i || need_min_apache_version('2.0.52');
+
+plan tests => 1 + @test_strings, $ok;
my $socket = Apache::TestRequest::vhost_socket('TestProtocol::echo_block');
1.6 +5 -2 modperl-2.0/t/protocol/echo_filter.t
Index: echo_filter.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/protocol/echo_filter.t,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- echo_filter.t 9 Jul 2004 21:48:13 -0000 1.5
+++ echo_filter.t 28 Sep 2004 22:43:42 -0000 1.6
@@ -1,13 +1,16 @@
use strict;
use warnings FATAL => 'all';
-use Test;
+use Apache::Test;
use Apache::TestUtil;
use Apache::TestRequest ();
my @test_strings = qw(hello world);
-plan tests => 1 + @test_strings;
+# blocking socket bug fixed in 2.0.52
+my $ok = $^O !~ /^(Open|Net)BSD$/i || need_min_apache_version('2.0.52');
+
+plan tests => 1 + @test_strings, $ok;
my $socket = Apache::TestRequest::vhost_socket('TestProtocol::echo_filter');
1.4 +4 -1 modperl-2.0/t/protocol/pseudo_http.t
Index: pseudo_http.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/protocol/pseudo_http.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- pseudo_http.t 3 Aug 2004 16:16:23 -0000 1.3
+++ pseudo_http.t 28 Sep 2004 22:43:42 -0000 1.4
@@ -18,7 +18,10 @@
my $passgood = "foobar";
my $passbad = "foObaR";
-plan tests => 13, need_auth && need_access;
+# blocking socket bug fixed in 2.0.52
+my $ok = $^O !~ /^(Open|Net)BSD$/i || need_min_apache_version('2.0.52');
+
+plan tests => 13, need need_auth, need_access, $ok;
{
# supply correct credential when prompted for such and ask the