Revamp t/85-stress-unwind.t

[perl/modules/Scope-Upper.git] / t / 59-unwind-threads.t

diff --git a/t/59-unwind-threads.t b/t/59-unwind-threads.t
index 30e16d351976d68e1d79e03528f187387bf292cf..56457670f74be22c6864d1814ab6346c36688ed9 100644 (file)
--- a/t/59-unwind-threads.t
+++ b/t/59-unwind-threads.t
@@ -3,47 +3,15 @@
 use strict;
 use warnings;
 
-sub skipall {
- my ($msg) = @_;
- require Test::More;
- Test::More::plan(skip_all => $msg);
-}
-
-use Config qw/%Config/;
-
-BEGIN {
- skipall 'This perl wasn\'t built to support threads'
-                                                    unless $Config{useithreads};
- skipall 'threads required to test thread safety' unless eval "use threads; 1";
-}
+use lib 't/lib';
+use Scope::Upper::TestThreads;
 
-my $num;
-BEGIN { $num = 20; }
+use Test::Leaner;
 
-use Test::More tests => $num;
-
-BEGIN {
- defined and diag "Using threads $_" for $threads::VERSION;
-
- if (eval "use Time::HiRes; 1") {
-  defined and diag "Using Time::HiRes $_" for $Time::HiRes::VERSION;
-  *usleep = \&Time::HiRes::usleep;
- } else {
-  diag 'Using fallback usleep';
-  *usleep = sub {
-   my $s = int($_[0] / 2.5e5);
-   sleep $s if $s;
-  };
- }
-}
-
-use Scope::Upper qw/unwind UP/;
+use Scope::Upper qw<unwind UP>;
 
 our $z;
 
-BEGIN {
-}
-
 sub up1 {
  my $tid  = threads->tid();
  local $z = $tid;
@@ -69,4 +37,10 @@ sub up1 {
  is_deeply \@res, [ -1, $tid .. $tid + 2, -2 ], "$p: unwinded correctly";
 }
 
-$_->join for map threads->create(\&up1), 1 .. $num;
+my @threads = map spawn(\&up1), 1 .. 30;
+
+$_->join for @threads;
+
+pass 'done';
+
+done_testing(scalar(@threads) + 1);