5.8.1 threads are wonky - tests no longer pass with recent DBD::Pg

[dbsrgits/DBIx-Class.git] / t / 51threads.t

diff --git a/t/51threads.t b/t/51threads.t
index 6d94aa5..14d74e3 100644 (file)
--- a/t/51threads.t
+++ b/t/51threads.t
@@ -2,41 +2,42 @@ use strict;
 use warnings;
 
 use Test::More;
-use Test::Exception;
 
 use Config;
-
-# README: If you set the env var to a number greater than 10,
-#   we will use that many children
-
 BEGIN {
     plan skip_all => 'Your perl does not support ithreads'
         if !$Config{useithreads};
 }
 
+BEGIN {
+    plan skip_all => 'Minimum of perl 5.8.3 required for thread tests (DBD::Pg mandated)'
+        if $] < '5.008003';
+}
+
 use threads;
+use Test::Exception;
+use lib qw(t/lib);
 
 my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_PG_${_}" } qw/DSN USER PASS/};
+plan skip_all => 'Set $ENV{DBICTEST_PG_DSN}, _USER and _PASS to run this test'
+      . ' (note: creates and drops a table named artist!)' unless ($dsn && $user);
+
+# README: If you set the env var to a number greater than 10,
+#   we will use that many children
 my $num_children = $ENV{DBICTEST_THREAD_STRESS};
 
 plan skip_all => 'Set $ENV{DBICTEST_THREAD_STRESS} to run this test'
     unless $num_children;
 
-plan skip_all => 'Set $ENV{DBICTEST_PG_DSN}, _USER and _PASS to run this test'
-      . ' (note: creates and drops a table named artist!)' unless ($dsn && $user);
-
-diag 'It is normal to see a series of "Scalars leaked: ..." messages during this test';
-
 if($num_children !~ /^[0-9]+$/ || $num_children < 10) {
    $num_children = 10;
 }
 
-plan tests => $num_children + 5;
-
-use lib qw(t/lib);
-
 use_ok('DBICTest::Schema');
 
+diag "\n\nIt is ok if you see series of 'Attempt to free unreferenced scalar: ...' warnings during this test\n "
+  if $] < '5.008005';
+
 my $schema = DBICTest::Schema->connection($dsn, $user, $pass, { AutoCommit => 1, RaiseError => 1, PrintError => 0 });
 
 my $parent_rs;
@@ -92,3 +93,5 @@ while(@children) {
 ok(1, "Made it to the end");
 
 $schema->storage->dbh->do("DROP TABLE cd");
+
+done_testing;