[Jifty-commit] r7282 - in jifty/trunk/lib/Jifty: . TestServer

Jifty commits jifty-commit at lists.jifty.org
Tue Jun 30 13:36:17 EDT 2009


Author: alexmv
Date: Tue Jun 30 13:36:16 2009
New Revision: 7282

Modified:
   jifty/trunk/lib/Jifty/Test/WWW/Mechanize.pm
   jifty/trunk/lib/Jifty/TestServer.pm
   jifty/trunk/lib/Jifty/TestServer/Apache.pm

Log:
Per-test Test::Builder object, for compat with new nested TAP support

Modified: jifty/trunk/lib/Jifty/Test/WWW/Mechanize.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Test/WWW/Mechanize.pm	(original)
+++ jifty/trunk/lib/Jifty/Test/WWW/Mechanize.pm	Tue Jun 30 13:36:16 2009
@@ -16,8 +16,6 @@
 use List::Util qw(first);
 use Carp;
 
-my $Test = Test::Builder->new;
-
 # XXX TODO: We're leaving out FLUFF errors because it complains about non-standard
 # attributes such as "autocomplete" on <form> elements.  There should be a better
 # way to fix this.
@@ -151,6 +149,7 @@
     my $moniker = shift;
 
     my $ret = $self->fill_in_action($moniker, @_);
+    my $Test = Test::Builder->new;
     $Test->ok($ret, "Filled in action $moniker");
 } 
 

Modified: jifty/trunk/lib/Jifty/TestServer.pm
==============================================================================
--- jifty/trunk/lib/Jifty/TestServer.pm	(original)
+++ jifty/trunk/lib/Jifty/TestServer.pm	Tue Jun 30 13:36:16 2009
@@ -4,7 +4,6 @@
 use warnings;
 use File::Spec;
 use Test::Builder;
-my $Tester = Test::Builder->new;
 
 # explicitly ignore ClassLoader objects in @INC,
 # which'd be ignored in the end, though.
@@ -36,6 +35,7 @@
 
         my $why = "live test doesn't work on Win32 at the moment";
 
+        my $Tester = Test::Builder->new;
         $Tester->skip($why);
 
         unless ($Tester->{No_Plan}) {
@@ -55,6 +55,7 @@
         $SIG{USR1} = sub { };
         sleep 15;
         $self->{started} = 1;
+        my $Tester = Test::Builder->new;
         $Tester->ok(1, $text);
         # XXX: pull from jifty::config maybe
         return "http://localhost:".$self->port;

Modified: jifty/trunk/lib/Jifty/TestServer/Apache.pm
==============================================================================
--- jifty/trunk/lib/Jifty/TestServer/Apache.pm	(original)
+++ jifty/trunk/lib/Jifty/TestServer/Apache.pm	Tue Jun 30 13:36:16 2009
@@ -4,7 +4,6 @@
 use warnings;
 use File::Spec;
 use Test::Builder;
-my $Tester = Test::Builder->new;
 
 # explicitly ignore ClassLoader objects in @INC,
 # which'd be ignored in the end, though.
@@ -65,6 +64,7 @@
             last if $pid = $self->pids;
             sleep 1;
         }
+        my $Tester = Test::Builder->new;
         if ($pid) {
             $self->{started} = 1;
             $Tester->ok(1, $text);


More information about the Jifty-commit mailing list