From: Peter Rabbitson <ribasushi@cpan.org>
Date: Sat, 10 Jul 2010 16:29:42 +0000 (+0200)
Subject: Adjust thread test diag
X-Git-Tag: v0.08124~115
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8ec03a3a564eb64e781e343f93f6948f043f8eb1;p=dbsrgits%2FDBIx-Class.git

Adjust thread test diag
---

diff --git a/t/51threads.t b/t/51threads.t
index 6d94aa5..3a26de9 100644
--- a/t/51threads.t
+++ b/t/51threads.t
@@ -2,41 +2,35 @@ 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};
 }
 
 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);
+diag 'It is normal to see a series of "Scalars leaked: ..." warnings during this test';
 
 use_ok('DBICTest::Schema');
-
 my $schema = DBICTest::Schema->connection($dsn, $user, $pass, { AutoCommit => 1, RaiseError => 1, PrintError => 0 });
 
 my $parent_rs;
@@ -92,3 +86,5 @@ while(@children) {
 ok(1, "Made it to the end");
 
 $schema->storage->dbh->do("DROP TABLE cd");
+
+done_testing;
diff --git a/t/51threadtxn.t b/t/51threadtxn.t
index eb3ee6a..74f6ce8 100644
--- a/t/51threadtxn.t
+++ b/t/51threadtxn.t
@@ -12,25 +12,22 @@ BEGIN {
 }
 
 use threads;
+use lib qw(t/lib);
 
 my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_PG_${_}" } qw/DSN USER PASS/};
-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';
+
+my $num_children = $ENV{DBICTEST_THREAD_STRESS};
+plan skip_all => 'Set $ENV{DBICTEST_THREAD_STRESS} to run this test'
+    unless $num_children;
 
 if($num_children !~ /^[0-9]+$/ || $num_children < 10) {
    $num_children = 10;
 }
 
-plan tests => $num_children + 5;
-
-use lib qw(t/lib);
+diag 'It is normal to see a series of "Scalars leaked: ..." warnings during this test';
 
 use_ok('DBICTest::Schema');
 
@@ -93,3 +90,5 @@ while(@children) {
 ok(1, "Made it to the end");
 
 $schema->storage->dbh->do("DROP TABLE cd");
+
+done_testing;