X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F51threads.t;h=7212dc90a8fdbd1b57ec3026a5b9b1f9ac606fa1;hb=93963f599878e7c2808c58083d214da5270a2691;hp=6d94aa5a8c129f65ad51f51db07a4f966e5225f1;hpb=ca507a2f6ea8ec84b455b8843bd161e3e5fac458;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/51threads.t b/t/51threads.t
index 6d94aa5..7212dc9 100644
--- a/t/51threads.t
+++ b/t/51threads.t
@@ -1,43 +1,41 @@
+use Config;
+BEGIN {
+  unless ($Config{useithreads}) {
+    print "1..0 # SKIP your perl does not support ithreads\n";
+    exit 0;
+  }
+}
+use threads;
+
 use strict;
 use warnings;
 
 use Test::More;
 use Test::Exception;
 
-use Config;
+plan skip_all => 'DBIC does not actively support threads before perl 5.8.5'
+  if $] < '5.008005';
 
-# 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 DBIx::Class::Optional::Dependencies ();
+use lib qw(t/lib);
 
-use threads;
+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 ($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';
-
+# 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} || 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 });
+my $schema = DBICTest::Schema->connect($dsn, $user, $pass, { AutoCommit => 1, RaiseError => 1, PrintError => 0 });
 
 my $parent_rs;
 
@@ -68,7 +66,7 @@ while(@children < $num_children) {
         if($row && $row->get_column('artist') =~ /^(?:123|456)$/) {
             $schema->resultset('CD')->create({ title => "test success $tid", artist => $tid, year => scalar(@children) });
         }
-        sleep(3);
+        sleep(1); # tasty crashes without this
     };
     die "Thread creation failed: $! $@" if !defined $newthread;
     push(@children, $newthread);
@@ -92,3 +90,5 @@ while(@children) {
 ok(1, "Made it to the end");
 
 $schema->storage->dbh->do("DROP TABLE cd");
+
+done_testing;