Make sure we load threads.pm before Test::More

diff --git a/t/51threads.t b/t/51threads.t
index a9d842b..fa07616 100644 (file)
--- a/t/51threads.t
+++ b/t/51threads.t
@@ -1,21 +1,21 @@
-use strict;
-use warnings;
-
-use Test::More;
-
 use Config;
 BEGIN {
-    plan skip_all => 'Your perl does not support ithreads'
-        if !$Config{useithreads};
+  unless ($Config{useithreads}) {
+    print "1..0 # SKIP your perl does not support ithreads\n";
+    exit 0;
+  }
 }
+use threads;
 
-BEGIN {
-    plan skip_all => 'Minimum of perl 5.8.5 required for thread tests (DBD::Pg mandated)'
-        if $] < '5.008005';
-}
+use strict;
+use warnings;
 
-use threads;
+use Test::More;
 use Test::Exception;
+
+plan skip_all => 'Minimum of perl 5.8.5 required for thread tests (DBD::Pg mandated)'
+  if $] < '5.008005';
+
 use DBIx::Class::Optional::Dependencies ();
 use lib qw(t/lib);
 
@@ -66,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);

diff --git a/t/51threadtxn.t b/t/51threadtxn.t
index 1245fab..96a0440 100644 (file)
--- a/t/51threadtxn.t
+++ b/t/51threadtxn.t
@@ -1,27 +1,26 @@
-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 Config;
 BEGIN {
-    plan skip_all => 'Your perl does not support ithreads'
-        if !$Config{useithreads};
+  unless ($Config{useithreads}) {
+    print "1..0 # SKIP your perl does not support ithreads\n";
+    exit 0;
+  }
 }
+use threads;
 
-BEGIN {
-    plan skip_all => 'Minimum of perl 5.8.5 required for thread tests (DBD::Pg mandated)'
-        if $] < '5.008005';
-}
+use strict;
+use warnings;
 
+use Test::More;
+
+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);
@@ -71,7 +70,7 @@ while(@children < $num_children) {
                 $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);