In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/df8d57333de0f29a6161f8306687739b123fc1f1?hp=5ec39af34356fc1ce06d38fb541689e59f9eff20>
- Log ----------------------------------------------------------------- commit df8d57333de0f29a6161f8306687739b123fc1f1 Author: Father Chrysostomos <[email protected]> Date: Mon Oct 27 12:49:15 2014 -0700 Restore previous Test::More::skip functionality Even though it would warn about no skip count, it would default to 1. The latest alpha breaks that, causing test failures on Windows. M cpan/Test-Simple/lib/Test/More.pm M cpan/Test-Simple/t/Legacy/skip.t commit 6213b78509c33ede3f8f1c125164376fe450fab7 Author: Chad Granum <[email protected]> Date: Sun Oct 26 21:32:27 2014 -0700 Update to Test::More alpha 064 * Fixes some docs * Fixes TODO behavior change M cpan/Test-Simple/lib/Test/Builder.pm M cpan/Test-Simple/lib/Test/Builder/Module.pm M cpan/Test-Simple/lib/Test/Builder/Tester.pm M cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm M cpan/Test-Simple/lib/Test/More.pm M cpan/Test-Simple/lib/Test/Simple.pm M cpan/Test-Simple/lib/Test/Stream.pm M cpan/Test-Simple/lib/Test/Stream/Architecture.pod M cpan/Test-Simple/lib/Test/Tester.pm M cpan/Test-Simple/lib/Test/use/ok.pm M cpan/Test-Simple/lib/ok.pm M cpan/Test-Simple/t/Legacy/skip.t ----------------------------------------------------------------------- Summary of changes: cpan/Test-Simple/lib/Test/Builder.pm | 2 +- cpan/Test-Simple/lib/Test/Builder/Module.pm | 2 +- cpan/Test-Simple/lib/Test/Builder/Tester.pm | 2 +- cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm | 2 +- cpan/Test-Simple/lib/Test/More.pm | 10 ++++++---- cpan/Test-Simple/lib/Test/Simple.pm | 2 +- cpan/Test-Simple/lib/Test/Stream.pm | 2 +- cpan/Test-Simple/lib/Test/Stream/Architecture.pod | 20 ++++++++++---------- cpan/Test-Simple/lib/Test/Tester.pm | 2 +- cpan/Test-Simple/lib/Test/use/ok.pm | 2 +- cpan/Test-Simple/lib/ok.pm | 2 +- cpan/Test-Simple/t/Legacy/skip.t | 4 +--- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/cpan/Test-Simple/lib/Test/Builder.pm b/cpan/Test-Simple/lib/Test/Builder.pm index c307e85..e7b5a99 100644 --- a/cpan/Test-Simple/lib/Test/Builder.pm +++ b/cpan/Test-Simple/lib/Test/Builder.pm @@ -4,7 +4,7 @@ use 5.008001; use strict; use warnings; -our $VERSION = '1.301001_063'; +our $VERSION = '1.301001_064'; $VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) use Test::More::Tools; diff --git a/cpan/Test-Simple/lib/Test/Builder/Module.pm b/cpan/Test-Simple/lib/Test/Builder/Module.pm index 32b57b0..53a166a 100644 --- a/cpan/Test-Simple/lib/Test/Builder/Module.pm +++ b/cpan/Test-Simple/lib/Test/Builder/Module.pm @@ -7,7 +7,7 @@ use Test::Builder 0.99; require Exporter; our @ISA = qw(Exporter); -our $VERSION = '1.301001_063'; +our $VERSION = '1.301001_064'; $VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) diff --git a/cpan/Test-Simple/lib/Test/Builder/Tester.pm b/cpan/Test-Simple/lib/Test/Builder/Tester.pm index 6e42c4c..9219b22 100644 --- a/cpan/Test-Simple/lib/Test/Builder/Tester.pm +++ b/cpan/Test-Simple/lib/Test/Builder/Tester.pm @@ -1,7 +1,7 @@ package Test::Builder::Tester; use strict; -our $VERSION = '1.301001_063'; +our $VERSION = '1.301001_064'; $VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) use Test::Builder 1.301001; diff --git a/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm b/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm index 774e16a..6338200 100644 --- a/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm +++ b/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm @@ -1,7 +1,7 @@ package Test::Builder::Tester::Color; use strict; -our $VERSION = '1.301001_063'; +our $VERSION = '1.301001_064'; $VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) require Test::Builder::Tester; diff --git a/cpan/Test-Simple/lib/Test/More.pm b/cpan/Test-Simple/lib/Test/More.pm index 7a2135c..1b12ac0 100644 --- a/cpan/Test-Simple/lib/Test/More.pm +++ b/cpan/Test-Simple/lib/Test/More.pm @@ -4,7 +4,7 @@ use 5.008001; use strict; use warnings; -our $VERSION = '1.301001_063'; +our $VERSION = '1.301001_064'; $VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) use Test::Stream::Carp qw/croak carp/; @@ -257,10 +257,12 @@ sub _skip { my $plan = $ctx->stream->plan; # If there is no plan we do not need to worry about counts - my $need_count = $plan ? !($plan->directive && $plan->directive eq 'NO PLAN') : 1; + my $need_count = $plan ? !($plan->directive && $plan->directive eq 'NO PLAN') : 0; - $ctx->alert("$func() needs to know \$how_many tests are in the block") - if $need_count && !defined $how_many; + if ($need_count && !defined $how_many) { + $ctx->alert("$func() needs to know \$how_many tests are in the block"); + $how_many = 1; + } $ctx->alert("$func() was passed a non-numeric number of tests. Did you get the arguments backwards?") if defined $how_many and $how_many =~ /\D/; diff --git a/cpan/Test-Simple/lib/Test/Simple.pm b/cpan/Test-Simple/lib/Test/Simple.pm index 90a53fe..2b24453 100644 --- a/cpan/Test-Simple/lib/Test/Simple.pm +++ b/cpan/Test-Simple/lib/Test/Simple.pm @@ -5,7 +5,7 @@ use 5.008001; use strict; use warnings; -our $VERSION = '1.301001_063'; +our $VERSION = '1.301001_064'; $VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) use Test::Stream '-internal'; diff --git a/cpan/Test-Simple/lib/Test/Stream.pm b/cpan/Test-Simple/lib/Test/Stream.pm index ec470b4..816576b 100644 --- a/cpan/Test-Simple/lib/Test/Stream.pm +++ b/cpan/Test-Simple/lib/Test/Stream.pm @@ -2,7 +2,7 @@ package Test::Stream; use strict; use warnings; -our $VERSION = '1.301001_063'; +our $VERSION = '1.301001_064'; $VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) use Test::Stream::Threads; diff --git a/cpan/Test-Simple/lib/Test/Stream/Architecture.pod b/cpan/Test-Simple/lib/Test/Stream/Architecture.pod index 620adcf..b98ce50 100644 --- a/cpan/Test-Simple/lib/Test/Stream/Architecture.pod +++ b/cpan/Test-Simple/lib/Test/Stream/Architecture.pod @@ -7,7 +7,7 @@ Test::Stream::Architecture - Overview of how the Test-More dist works. This is the document that explains the architecture of Test::More and all the stuff driving it under the hood. -=head1 KEY COMPONTENTS +=head1 KEY COMPONENTS This is the list of primary components and their brief description, The most critical ones will have more details in later sections. @@ -90,9 +90,9 @@ proper object. All events must use Test::Stream::Event as a base. This is the L<Moose> of Test::Stream. It is responsible for generating accessors and similar work. Unlike moose and others it uses an arrayref as the -underlying object. This design descision was made to improve performance. +underlying object. This design decision was made to improve performance. Performance was a real problem in some early alphas, the gains from the -descision are huge. +decision are huge. =item Test::Stream::Tester @@ -118,7 +118,7 @@ number, and shove them through the correct output. The singleton model proved to be a major headache. -Intercepting events typically meant replacing the singleton perminantly +Intercepting events typically meant replacing the singleton permanently (Test::Tester) or for a limited scope. Another option people took (Test::Builder::Tester) was to simply replace the IO handles Test::Builder was tracking. @@ -160,7 +160,7 @@ in the order they are added. There is not currently any way to remove a munger. -B<Note:> each munger is called in a loop in the C<send()> method, so keep it is +B<Note:> each munger is called in a loop in the C<send()> method, so keep it as fast and small as possible. =item Forward all events to listeners (including TAP output) @@ -224,7 +224,7 @@ If there is a context already in play, that instance will be returned. Otherwise a new context will be returned. The context assumes that the stack level just above your call is where errors should be reported. -You can optionally provide an integer as the only argument, in whcih case that +You can optionally provide an integer as the only argument, in which case that number will be added to the C<caller()> call to find the correct frame for reporting. This will be completely ignored if there is already an active context. @@ -245,7 +245,7 @@ In the example above c<my_ok()> generates a new context, then it calls C<ok()>, in this case both function will have the same context object, the one generated by my_ok. The result is that C<ok> will report errors to the correct place. -=head3 IMPLEMENTEATION +=head3 IMPLEMENTATION There is a variable C<$CURRENT> in C<Test::Stream::Context>, it is a lexical, so you can not touch it directly. When the C<context()> function is called, it @@ -258,7 +258,7 @@ scope, or is otherwise removed, C<$CURRENT> will vanish on its own. This means that so long as you hold on to your context object, anything you call will find it. -B<The caveat> here is that if you descide to hold on to your context beyond +B<The caveat> here is that if you decide to hold on to your context beyond your scope, you could sabatoge any future test functions. If you need to hold on to a context you need to call C<< $context->snapshot >>, and store the cloned object it returns. In general you should not need to do this, event @@ -266,9 +266,9 @@ objects all store the context, but do so using a snapshot. B<Note> I am open to changing this to remove the weak-reference magic and instead require someone to call C<< $context->release >> or similar when they -are done with a context, but that seams more likely to result in rougue +are done with a context, but that seems more likely to result in rougue contexts... This method would also require its own form of reference counting.. -This descision will need to be made before we go stable. +This decision will need to be made before we go stable. =head2 GENERATING EVENTS diff --git a/cpan/Test-Simple/lib/Test/Tester.pm b/cpan/Test-Simple/lib/Test/Tester.pm index 25a62a9..1e52c1a 100644 --- a/cpan/Test-Simple/lib/Test/Tester.pm +++ b/cpan/Test-Simple/lib/Test/Tester.pm @@ -15,7 +15,7 @@ require Exporter; use vars qw( @ISA @EXPORT $VERSION ); -our $VERSION = '1.301001_063'; +our $VERSION = '1.301001_064'; $VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) @EXPORT = qw( run_tests check_tests check_test cmp_results show_space ); diff --git a/cpan/Test-Simple/lib/Test/use/ok.pm b/cpan/Test-Simple/lib/Test/use/ok.pm index ccbd5ad..68d6307 100644 --- a/cpan/Test-Simple/lib/Test/use/ok.pm +++ b/cpan/Test-Simple/lib/Test/use/ok.pm @@ -3,7 +3,7 @@ use strict; use warnings; use 5.005; -our $VERSION = '1.301001_063'; +our $VERSION = '1.301001_064'; $VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) 1; diff --git a/cpan/Test-Simple/lib/ok.pm b/cpan/Test-Simple/lib/ok.pm index f20230e..909b7c6 100644 --- a/cpan/Test-Simple/lib/ok.pm +++ b/cpan/Test-Simple/lib/ok.pm @@ -5,7 +5,7 @@ use warnings; use Test::More 1.301001 (); use Test::Stream::Carp qw/croak/; -our $VERSION = '1.301001_063'; +our $VERSION = '1.301001_064'; $VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) sub import { diff --git a/cpan/Test-Simple/t/Legacy/skip.t b/cpan/Test-Simple/t/Legacy/skip.t index df4d6e1..6a0612a 100644 --- a/cpan/Test-Simple/t/Legacy/skip.t +++ b/cpan/Test-Simple/t/Legacy/skip.t @@ -7,7 +7,7 @@ BEGIN { } } -use Test::More; +use Test::More tests => 16; BEGIN { require warnings; @@ -103,5 +103,3 @@ SKIP: { like $warning, qr/^skip\(\) was passed a non-numeric number of tests/; } - -done_testing; -- Perl5 Master Repository
