From: Vincent Pit <vince@profvince.com>
Date: Fri, 11 Nov 2011 18:41:17 +0000 (+0100)
Subject: Threads tests may not be able to spawn all the threads
X-Git-Tag: v0.11~14
X-Git-Url: http://git.vpit.fr/?a=commitdiff_plain;h=bff16fe7ea455b013bb0e681f2852f6c11d72636;p=perl%2Fmodules%2Fautovivification.git

Threads tests may not be able to spawn all the threads

To work around this :
- move all the threads boilerplate to a new helper test module ;
- capture the warnings/errors that threads->create may throw and reprint
them properly as diagnostics ;
- use Test::Leaner instead of Test::More, as older Test::More sometimes
cause out of sequence bugs ;
- last but not least, do not hardcode the plan and use done_testing with
the actual number of spawned threads instead.
---

diff --git a/MANIFEST b/MANIFEST
index 77de2e2..37ae8df 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -42,3 +42,4 @@ t/lib/autovivification/TestRequired5/b0.pm
 t/lib/autovivification/TestRequired5/c0.pm
 t/lib/autovivification/TestRequired5/d0.pm
 t/lib/autovivification/TestRequired6.pm
+t/lib/autovivification/TestThreads.pm
diff --git a/t/50-threads.t b/t/50-threads.t
index 9c09545..e8e7cfe 100644
--- a/t/50-threads.t
+++ b/t/50-threads.t
@@ -3,42 +3,13 @@
 use strict;
 use warnings;
 
-sub skipall {
- my ($msg) = @_;
- require Test::More;
- Test::More::plan(skip_all => $msg);
-}
-
-use Config qw<%Config>;
-
-BEGIN {
- my $force = $ENV{PERL_AUTOVIVIFICATION_TEST_THREADS} ? 1 : !1;
- skipall 'This perl wasn\'t built to support threads'
-                                                    unless $Config{useithreads};
- skipall 'perl 5.13.4 required to test thread safety'
-                                              unless $force or "$]" >= 5.013004;
-}
+use lib 't/lib';
+use autovivification::TestThreads;
 
-use threads;
+use Test::Leaner;
 
-use Test::More;
-
-BEGIN {
- require autovivification;
- skipall 'This autovivification isn\'t thread safe'
-                                        unless autovivification::A_THREADSAFE();
-}
-
-my ($threads, $runs);
-BEGIN {
- $threads = 10;
- $runs    = 2;
-}
-
-BEGIN {
- plan tests => $threads * $runs * 3 * (1 + 2);
- defined and diag "Using threads $_" for $threads::VERSION;
-}
+my $threads = 10;
+my $runs    = 2;
 
 {
  no autovivification;
@@ -90,5 +61,10 @@ SKIP:
  }
 }
 
-my @t = map threads->create(\&try), 1 .. $threads;
-$_->join for @t;
+my @threads = map spawn(\&try), 1 .. $threads;
+
+$_->join for @threads;
+
+pass 'done';
+
+done_testing(scalar(@threads) * $runs * 3 * (1 + 2) + 1);
diff --git a/t/51-threads-teardown.t b/t/51-threads-teardown.t
index e5461c6..a688df8 100644
--- a/t/51-threads-teardown.t
+++ b/t/51-threads-teardown.t
@@ -3,33 +3,10 @@
 use strict;
 use warnings;
 
-sub skipall {
- my ($msg) = @_;
- require Test::More;
- Test::More::plan(skip_all => $msg);
-}
-
-use Config qw<%Config>;
-
-BEGIN {
- my $force = $ENV{PERL_AUTOVIVIFICATION_TEST_THREADS} ? 1 : !1;
- skipall 'This perl wasn\'t built to support threads'
-                                                    unless $Config{useithreads};
- skipall 'perl 5.13.4 required to test thread safety'
-                                              unless $force or "$]" >= 5.013004;
-}
+use lib 't/lib';
+use autovivification::TestThreads;
 
-use threads;
-
-use Test::More;
-
-BEGIN {
- require autovivification;
- skipall 'This autovivification isn\'t thread safe'
-                                        unless autovivification::A_THREADSAFE();
- plan tests => 1;
- defined and diag "Using threads $_" for $threads::VERSION;
-}
+use Test::Leaner tests => 1;
 
 sub run_perl {
  my $code = shift;
diff --git a/t/lib/autovivification/TestThreads.pm b/t/lib/autovivification/TestThreads.pm
new file mode 100644
index 0000000..2fe58e0
--- /dev/null
+++ b/t/lib/autovivification/TestThreads.pm
@@ -0,0 +1,68 @@
+package autovivification::TestThreads;
+
+use strict;
+use warnings;
+
+use Config qw<%Config>;
+
+sub skipall {
+ my ($msg) = @_;
+ require Test::Leaner;
+ Test::Leaner::plan(skip_all => $msg);
+}
+
+sub diag {
+ require Test::Leaner;
+ Test::Leaner::diag(@_);
+}
+
+sub import {
+ shift;
+
+ require autovivification;
+
+ skipall 'This autovivification isn\'t thread safe'
+                                        unless autovivification::A_THREADSAFE();
+
+ my $force = $ENV{PERL_AUTOVIVIFICATION_TEST_THREADS} ? 1 : !1;
+ skipall 'This perl wasn\'t built to support threads'
+                                                    unless $Config{useithreads};
+ skipall 'perl 5.13.4 required to test thread safety'
+                                              unless $force or "$]" >= 5.013004;
+
+ my $t_v = $force ? '0' : '1.67';
+ my $has_threads =  do {
+  local $@;
+  eval "use threads $t_v; 1";
+ };
+ skipall "threads $t_v required to test thread safety" unless $has_threads;
+
+ defined and diag "Using threads $_" for $threads::VERSION;
+
+ my %exports = (
+  spawn => \&spawn,
+ );
+
+ my $pkg = caller;
+ while (my ($name, $code) = each %exports) {
+  no strict 'refs';
+  *{$pkg.'::'.$name} = $code;
+ }
+}
+
+sub spawn {
+ local $@;
+ my @diag;
+ my $thread = eval {
+  local $SIG{__WARN__} = sub { push @diag, "Thread creation warning: @_" };
+  threads->create(@_);
+ };
+ push @diag, "Thread creation error: $@" if $@;
+ if (@diag) {
+  require Test::Leaner;
+  Test::Leaner::diag($_) for @diag;
+ }
+ return $thread ? $thread : ();
+}
+
+1;