svn commit: r594682 - in /perl/modperl/trunk/t: modperl/cookie.t response/TestModperl/cookie.pm

[go...@apache.org]

Author: gozer
Date: Tue Nov 13 14:43:25 2007
New Revision: 594682

URL: http://svn.apache.org/viewvc?rev=594682&view=rev
Log:
Simplify this test, using keepalives instead of the same_interp
stuff works just fine. And it's simpler. This one is for Fred.


Modified:
    perl/modperl/trunk/t/modperl/cookie.t
    perl/modperl/trunk/t/response/TestModperl/cookie.pm

Modified: perl/modperl/trunk/t/modperl/cookie.t
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/modperl/cookie.t?rev=594682&r1=594681&r2=594682&view=diff
==============================================================================
--- perl/modperl/trunk/t/modperl/cookie.t (original)
+++ perl/modperl/trunk/t/modperl/cookie.t Tue Nov 13 14:43:25 2007
@@ -19,6 +19,7 @@
 use Apache::Test;
 use Apache::TestUtil;
 use Apache::TestRequest;
+Apache::TestRequest::user_agent(keep_alive => 1);
 
 use TestCommon::SameInterp;
 
@@ -42,20 +43,18 @@
 my @tests_ordered = qw(header env nocookie);
 
 t_debug "getting the same interp ID for $location";
-my $same_interp = Apache::TestRequest::same_interp_tie($location);
 
-my $skip = $same_interp ? 0 : 1;
+GET $location;
+
 for my $test (@tests_ordered) {
     my $expected = $test eq 'nocookie' ? '' : "bar";
     my @headers = ();
     push @headers, (Cookie => $cookies{$test}) unless $test eq 'nocookie';
 
-    my $received = same_interp_req_body($same_interp, \&GET,
-                                        "$location?$test", @headers);
-    $skip++ unless defined $received;
-    same_interp_skip_not_found(
-        $skip,
-        $received,
+    my $received = GET "$location?$test", @headers;
+    
+    ok t_cmp(
+        $received->content,
         $expected,
         "perl-script+SetupEnv/cookie: $test"
     );

Modified: perl/modperl/trunk/t/response/TestModperl/cookie.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/response/TestModperl/cookie.pm?rev=594682&r1=594681&r2=594682&view=diff
==============================================================================
--- perl/modperl/trunk/t/response/TestModperl/cookie.pm (original)
+++ perl/modperl/trunk/t/response/TestModperl/cookie.pm Tue Nov 13 14:43:25 2007
@@ -48,7 +48,6 @@
 __DATA__
 SetHandler perl-script
 PerlModule          TestModperl::cookie
-PerlInitHandler     Apache::TestHandler::same_interp_fixup
 PerlAccessHandler   TestModperl::cookie::access
 PerlResponseHandler TestModperl::cookie
 PerlOptions -SetupEnv