Fix failures with DBICTEST_SQLITE_USE_FILE=1 introduced by 50261284

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

diff --git a/t/51threadtxn.t b/t/51threadtxn.t
index 4c218d0..1245fab 100644 (file)
--- a/t/51threadtxn.t
+++ b/t/51threadtxn.t
@@ -12,32 +12,30 @@ BEGIN {
 }
 
 BEGIN {
-    plan skip_all => 'Minimum of perl 5.8.3 required for thread tests (DBD::Pg mandated)'
-        if $] < '5.008003';
+    plan skip_all => 'Minimum of perl 5.8.5 required for thread tests (DBD::Pg mandated)'
+        if $] < '5.008005';
 }
 
 
 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);
 
+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};
-plan skip_all => 'Set $ENV{DBICTEST_THREAD_STRESS} to run this test'
-    unless $num_children;
-
+my $num_children = $ENV{DBICTEST_THREAD_STRESS} || 1;
 if($num_children !~ /^[0-9]+$/ || $num_children < 10) {
    $num_children = 10;
 }
 
 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;