X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F51threads.t;h=4564e3fe3d047711d3eff55468d0d703555d6da4;hb=35f5c265f7114c98663ac471e54b4ea9e34b3f37;hp=a7a3a78053a7db33a878d12101685e0eaf980fec;hpb=a1cb5921a914f087163914b010ca0c4e72a57dcc;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/51threads.t b/t/51threads.t
index a7a3a78..4564e3f 100644
--- a/t/51threads.t
+++ b/t/51threads.t
@@ -1,44 +1,43 @@
 use strict;
 use warnings;
-use Test::More;
-use Config;
 
-# README: If you set the env var to a number greater than 10,
-#   we will use that many children
+use Test::More;
 
+use Config;
 BEGIN {
     plan skip_all => 'Your perl does not support ithreads'
-        if !$Config{useithreads} || $] < 5.008;
+        if !$Config{useithreads};
 }
 
 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;
 
-eval {
+lives_ok (sub {
     my $dbh = $schema->storage->dbh;
 
     {
@@ -52,8 +51,7 @@ eval {
 
     $parent_rs = $schema->resultset('CD')->search({ year => 1901 });
     $parent_rs->next;
-};
-ok(!$@) or diag "Creation eval failed: $@";
+}, 'populate successfull');
 
 my @children;
 while(@children < $num_children) {
@@ -90,3 +88,5 @@ while(@children) {
 ok(1, "Made it to the end");
 
 $schema->storage->dbh->do("DROP TABLE cd");
+
+done_testing;