X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F51threadtxn.t;h=1245fab3059e4cab9f5f10c559cd05c1a77d4136;hb=2b3fc4088d96e40ac23b3871b26d4a1faff17aed;hp=eb3ee6abdb1550bcd8051828c26334ea9c09b43c;hpb=55087b9990ac4c004f1e6b9742f73d89274cf7f2;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/t/51threadtxn.t b/t/51threadtxn.t
index eb3ee6a..1245fab 100644
--- a/t/51threadtxn.t
+++ b/t/51threadtxn.t
@@ -11,27 +11,29 @@ BEGIN {
         if !$Config{useithreads};
 }
 
-use threads;
+BEGIN {
+    plan skip_all => 'Minimum of perl 5.8.5 required for thread tests (DBD::Pg mandated)'
+        if $] < '5.008005';
+}
 
-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;
+use threads;
+use DBIx::Class::Optional::Dependencies ();
+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);
 
-diag 'It is normal to see a series of "Scalars leaked: ..." messages during this test';
+plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for ('rdbms_pg')
+  unless DBIx::Class::Optional::Dependencies->req_ok_for ('rdbms_pg');
 
+my $num_children = $ENV{DBICTEST_THREAD_STRESS} || 1;
 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');
 
 my $schema = DBICTest::Schema->connection($dsn, $user, $pass, { AutoCommit => 1, RaiseError => 1, PrintError => 0 });
@@ -93,3 +95,5 @@ while(@children) {
 ok(1, "Made it to the end");
 
 $schema->storage->dbh->do("DROP TABLE cd");
+
+done_testing;