Return-Path: Delivered-To: apmail-perl-modperl-cvs-archive@www.apache.org Received: (qmail 70990 invoked from network); 13 Nov 2007 22:43:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Nov 2007 22:43:49 -0000 Received: (qmail 98650 invoked by uid 500); 13 Nov 2007 22:43:36 -0000 Delivered-To: apmail-perl-modperl-cvs-archive@perl.apache.org Received: (qmail 98579 invoked by uid 500); 13 Nov 2007 22:43:36 -0000 Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@perl.apache.org List-Id: Delivered-To: mailing list modperl-cvs@perl.apache.org Received: (qmail 98568 invoked by uid 99); 13 Nov 2007 22:43:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Nov 2007 14:43:36 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Nov 2007 22:44:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F088C1A9832; Tue, 13 Nov 2007 14:43:25 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r594682 - in /perl/modperl/trunk/t: modperl/cookie.t response/TestModperl/cookie.pm Date: Tue, 13 Nov 2007 22:43:25 -0000 To: modperl-cvs@perl.apache.org From: gozer@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071113224325.F088C1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on 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