From: Peter Rabbitson <ribasushi@cpan.org>
Date: Tue, 29 Nov 2011 06:31:21 +0000 (+0100)
Subject: Adjust tests to work correctly with the upcoming Test::Builder 1.005
X-Git-Tag: v0.08197~88
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7be5717eb2be4fa484e665853777f1c10c6deced;p=dbsrgits%2FDBIx-Class.git

Adjust tests to work correctly with the upcoming Test::Builder 1.005

Also deduplicate code in the persistence runners of t/52leaks.t
---

diff --git a/Changes b/Changes
index 71b24e4..989a8ff 100644
--- a/Changes
+++ b/Changes
@@ -31,6 +31,7 @@ Revision history for DBIx::Class
     * Misc
         - Centralized leak-checks for all instances of DBICTest::Schema
           from within any test
+        - Now passes all tests with Test::Builder 1.005
         - Codebase is now trailing-whitespace-free
         - Cleanup of complex resultset update/delete oprations - storage
           specific code moved back to ResultSet and replaced by checks
diff --git a/t/52leaks.t b/t/52leaks.t
index 13158e1..796453b 100644
--- a/t/52leaks.t
+++ b/t/52leaks.t
@@ -23,14 +23,26 @@ use Test::More;
 
 my $TB = Test::More->builder;
 if ($ENV{DBICTEST_IN_PERSISTENT_ENV}) {
-  # without this explicit close ->reset below warns
-  close ($TB->$_) for qw/output failure_output/;
+  # without this explicit close older TBs warn in END after a ->reset
+  if ($TB->VERSION < 1.005) {
+    close ($TB->$_) for (qw/output failure_output todo_output/);
+  }
 
-  # so done_testing can work
-  $TB->reset;
+  # if I do not do this, I get happy sigpipes on new TB, no idea why
+  # (the above close-and-forget doesn't work - new TB does *not* reopen
+  # its handles automatically anymore)
+  else {
+    for (qw/failure_output todo_output/) {
+      close $TB->$_;
+      open ($TB->$_, '>&', *STDERR);
+    }
 
-  # this simulates a subtest
-  $TB->_indent(' ' x 4);
+    close $TB->output;
+    open ($TB->output, '>&', *STDOUT);
+  }
+
+  # so done_testing can work on every persistent pass
+  $TB->reset;
 }
 
 use lib qw(t/lib);
@@ -67,6 +79,11 @@ unless (DBICTest::RunMode->is_plain) {
       }
     );
 
+    # Test Builder is now making a new object for every pass/fail (que bloat?)
+    # and as such we can't really store any of its objects (since it will
+    # re-populate the registry while checking it, ewwww!)
+    return $obj if (ref $obj) =~ /^TB2::/;
+
     # weaken immediately to avoid weird side effects
     return populate_weakregistry ($weak_registry, $obj );
   };
@@ -401,20 +418,27 @@ assert_empty_weakregistry ($weak_registry);
 # this is ugly and dirty but we do not yet have a Test::Embedded or
 # similar
 
-my @pperl_cmd = (qw/pperl --prefork=1/, __FILE__);
-my @pperl_term_cmd = @pperl_cmd;
-splice @pperl_term_cmd, 1, 0, '--kill';
+my $persistence_tests = {
+  PPerl => {
+    cmd => [qw/pperl --prefork=1/, __FILE__],
+  },
+  'CGI::SpeedyCGI' => {
+    cmd => [qw/speedy -- -t5/, __FILE__],
+  },
+};
 
 # scgi is smart and will auto-reap after -t amount of seconds
-my @scgi_cmd = (qw/speedy -- -t5/, __FILE__);
+# pperl needs an actual killer :(
+$persistence_tests->{PPerl}{termcmd} = [
+  $persistence_tests->{PPerl}{cmd}[0],
+  '--kill',
+  @{$persistence_tests->{PPerl}{cmd}}[ 1 .. $#{$persistence_tests->{PPerl}{cmd}} ],
+];
 
 SKIP: {
   skip 'Test already in a persistent loop', 1
     if $ENV{DBICTEST_IN_PERSISTENT_ENV};
 
-  skip 'Persistence test disabled on regular installs', 1
-    if DBICTest::RunMode->is_plain;
-
   skip 'Main test failed - skipping persistent env tests', 1
     unless $TB->is_passing;
 
@@ -424,47 +448,44 @@ SKIP: {
 
   local $ENV{DBICTEST_IN_PERSISTENT_ENV} = 1;
 
-  # try with pperl
-  SKIP: {
-    skip 'PPerl persistent environment tests require PPerl', 1
-      unless eval { require PPerl };
+  require IPC::Open2;
+
+  for my $type (keys %$persistence_tests) { SKIP: {
+      skip "$type module not found", 1
+        unless eval "require $type";
+
+    my @cmd = @{$persistence_tests->{$type}{cmd}};
 
     # since PPerl is racy and sucks - just prime the "server"
     {
       local $ENV{DBICTEST_PERSISTENT_ENV_BAIL_EARLY} = 1;
-      system(@pperl_cmd);
+      system(@cmd);
       sleep 1;
 
-      # see if it actually runs - if not might as well bail now
-      skip "Something is wrong with pperl ($!)", 1
-        if system(@pperl_cmd);
+      # see if the thing actually runs, if not - might as well bail now
+      skip "Something is wrong with $type ($!)", 1
+        if system(@cmd);
     }
 
     for (1,2,3) {
-      system(@pperl_cmd);
-      ok (!$?, "Run in persistent env (PPerl pass $_): exit $?");
-    }
-
-    ok (! system (@pperl_term_cmd), 'killed pperl instance');
-  }
-
-  # try with speedy-cgi
-  SKIP: {
-    skip 'SPeedyCGI persistent environment tests require CGI::SpeedyCGI', 1
-      unless eval { require CGI::SpeedyCGI };
-
-    {
-      local $ENV{DBICTEST_PERSISTENT_ENV_BAIL_EARLY} = 1;
-      skip "Something is wrong with speedy ($!)", 1
-        if system(@scgi_cmd);
-      sleep 1;
+      note ("Starting run in persistent env ($type pass $_)");
+      IPC::Open2::open2(my $out, undef, @cmd);
+      my @out_lines;
+      while (my $ln = <$out>) {
+        next if $ln =~ /^\s*$/;
+        push @out_lines, "   $ln";
+        last if $ln =~ /^\d+\.\.\d+$/;  # this is persistence, we need to terminate reading on our end
+      }
+      print $_ for @out_lines;
+      close $out;
+      wait;
+      ok (!$?, "Run in persistent env ($type pass $_): exit $?");
+      ok (scalar @out_lines, "Run in persistent env ($type pass $_): got output");
     }
 
-    for (1,2,3) {
-      system(@scgi_cmd);
-      ok (!$?, "Run in persistent env (SpeedyCGI pass $_): exit $?");
-    }
-  }
+    ok (! system (@{$persistence_tests->{$type}{termcmd}}), "killed $type server instance")
+      if $persistence_tests->{$type}{termcmd};
+  }}
 }
 
 done_testing;
@@ -473,9 +494,8 @@ done_testing;
 # PID files to go by (man does pperl really suck :(
 END {
   unless ($ENV{DBICTEST_IN_PERSISTENT_ENV}) {
-    close STDOUT;
-    close STDERR;
+    close $_ for (*STDIN, *STDOUT, *STDERR);
     local $?; # otherwise test will inherit $? of the system()
-    system (@pperl_term_cmd);
+    system (@{$persistence_tests->{PPerl}{termcmd}});
   }
 }
diff --git a/t/71mysql.t b/t/71mysql.t
index c2318f8..b4f01f4 100644
--- a/t/71mysql.t
+++ b/t/71mysql.t
@@ -374,11 +374,15 @@ ZEROINSEARCH: {
 
   my $rs = $schema_autorecon->resultset('Artist');
 
+  my ($parent_in, $child_out);
+  pipe( $parent_in, $child_out ) or die "Pipe open failed: $!";
   my $pid = fork();
   if (! defined $pid ) {
     die "fork() failed: $!"
   }
   elsif ($pid) {
+    close $child_out;
+
     # sanity check
     $schema_autorecon->storage->dbh_do(sub {
       is ($_[1], $orig_dbh, 'Storage holds correct $dbh in parent');
@@ -395,18 +399,22 @@ ZEROINSEARCH: {
     }
   }
   else {
-    # wait for parent to kill its $dbh
-    sleep 1;
+    close $parent_in;
 
     #simulate a  subtest to not confuse the parent TAP emission
-    Test::More->builder->reset;
-    Test::More->builder->plan('no_plan');
-    Test::More->builder->_indent(' ' x 4);
+    my $tb = Test::More->builder;
+    $tb->reset;
+    for (qw/output failure_output todo_output/) {
+      close $tb->$_;
+      open ($tb->$_, '>&', $child_out);
+    }
+
+    # wait for parent to kill its $dbh
+    sleep 1;
 
     # try to do something dbic-esque
     $rs->create({ name => "Hardcore Forker $$" });
 
-
     TODO: {
       local $TODO = "Perl $] is known to leak like a sieve"
         if DBIx::Class::_ENV_::PEEPEENESS();
@@ -414,9 +422,13 @@ ZEROINSEARCH: {
       ok (! defined $orig_dbh, 'DBIC operation triggered reconnect - old $dbh is gone');
     }
 
+    done_testing;
     exit 0;
   }
 
+  while (my $ln = <$parent_in>) {
+    print "   $ln";
+  }
   wait;
   ok(!$?, 'Child subtests passed');