Hello community,
here is the log from the commit of package perl-Test-Simple for
openSUSE:Factory checked in at 2020-08-15 21:17:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Test-Simple (Old)
and /work/SRC/openSUSE:Factory/.perl-Test-Simple.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Test-Simple"
Sat Aug 15 21:17:36 2020 rev:32 rq:826130 version:1.302177
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Test-Simple/perl-Test-Simple.changes
2020-04-18 00:26:44.797594630 +0200
+++
/work/SRC/openSUSE:Factory/.perl-Test-Simple.new.3399/perl-Test-Simple.changes
2020-08-15 21:18:00.115541887 +0200
@@ -1,0 +2,12 @@
+Sat Aug 8 03:11:19 UTC 2020 - Tina Müller <[email protected]>
+
+- updated to 1.302177
+ see /usr/share/doc/packages/perl-Test-Simple/Changes
+
+ 1.302177 2020-08-06 21:46:06-07:00 America/Los_Angeles
+ - Minor fix to author downstream test
+ - No significant changes since the last trial
+ 1.302176 2020-08-05 21:45:19-07:00 America/Los_Angeles (TRIAL RELEASE)
+ - Fix Test::More's $TODO inside intercept (#862)
+
+-------------------------------------------------------------------
Old:
----
Test-Simple-1.302175.tar.gz
New:
----
Test-Simple-1.302177.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Test-Simple.spec ++++++
--- /var/tmp/diff_new_pack.QfkR4I/_old 2020-08-15 21:18:00.555542138 +0200
+++ /var/tmp/diff_new_pack.QfkR4I/_new 2020-08-15 21:18:00.559542140 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-Test-Simple
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,13 @@
Name: perl-Test-Simple
-Version: 1.302175
+Version: 1.302177
Release: 0
%define cpan_name Test-Simple
Summary: Basic utilities for writing tests
License: Artistic-1.0 OR GPL-1.0-or-later
Group: Development/Libraries/Perl
-Url: https://metacpan.org/release/%{cpan_name}
+URL: https://metacpan.org/release/%{cpan_name}
Source0:
https://cpan.metacpan.org/authors/id/E/EX/EXODIST/%{cpan_name}-%{version}.tar.gz
Source1: cpanspec.yml
BuildArch: noarch
++++++ Test-Simple-1.302175.tar.gz -> Test-Simple-1.302177.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/Changes
new/Test-Simple-1.302177/Changes
--- old/Test-Simple-1.302175/Changes 2020-04-13 20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/Changes 2020-08-07 06:46:07.000000000 +0200
@@ -1,3 +1,12 @@
+1.302177 2020-08-06 21:46:06-07:00 America/Los_Angeles
+
+ - Minor fix to author downstream test
+ - No significant changes since the last trial
+
+1.302176 2020-08-05 21:45:19-07:00 America/Los_Angeles (TRIAL RELEASE)
+
+ - Fix Test::More's $TODO inside intercept (#862)
+
1.302175 2020-04-13 11:37:36-07:00 America/Los_Angeles
- Fix typos in POD
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/MANIFEST
new/Test-Simple-1.302177/MANIFEST
--- old/Test-Simple-1.302175/MANIFEST 2020-04-13 20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/MANIFEST 2020-08-07 06:46:07.000000000 +0200
@@ -333,6 +333,7 @@
t/regression/757-reset_in_subtest.t
t/regression/812-todo.t
t/regression/817-subtest-todo.t
+t/regression/862-intercept_tb_todo.t
t/regression/buffered_subtest_plan_buffered.t
t/regression/builder_does_not_init.t
t/regression/errors_facet.t
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/META.json
new/Test-Simple-1.302177/META.json
--- old/Test-Simple-1.302175/META.json 2020-04-13 20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/META.json 2020-08-07 06:46:07.000000000 +0200
@@ -48,7 +48,7 @@
"url" : "http://github.com/Test-More/test-more/";
}
},
- "version" : "1.302175",
+ "version" : "1.302177",
"x_breaks" : {
"Log::Dispatch::Config::TestLog" : "<= 0.02",
"Net::BitTorrent" : "<= 0.052",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/META.yml
new/Test-Simple-1.302177/META.yml
--- old/Test-Simple-1.302175/META.yml 2020-04-13 20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/META.yml 2020-08-07 06:46:07.000000000 +0200
@@ -22,7 +22,7 @@
resources:
bugtracker: http://github.com/Test-More/test-more/issues
repository: http://github.com/Test-More/test-more/
-version: '1.302175'
+version: '1.302177'
x_breaks:
Log::Dispatch::Config::TestLog: '<= 0.02'
Net::BitTorrent: '<= 0.052'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/Makefile.PL
new/Test-Simple-1.302177/Makefile.PL
--- old/Test-Simple-1.302175/Makefile.PL 2020-04-13 20:37:37.000000000
+0200
+++ new/Test-Simple-1.302177/Makefile.PL 2020-08-07 06:46:07.000000000
+0200
@@ -23,7 +23,7 @@
"Storable" => 0,
"utf8" => 0
},
- "VERSION" => "1.302175",
+ "VERSION" => "1.302177",
"test" => {
"TESTS" => "t/*.t t/Legacy/*.t t/Legacy/Bugs/*.t t/Legacy/Builder/*.t
t/Legacy/Regression/*.t t/Legacy/Simple/*.t t/Legacy/Test2/*.t
t/Legacy/Tester/*.t t/Legacy/subtest/*.t t/Legacy_And_Test2/*.t
t/Test2/acceptance/*.t t/Test2/behavior/*.t t/Test2/legacy/*.t
t/Test2/modules/*.t t/Test2/modules/API/*.t t/Test2/modules/Event/*.t
t/Test2/modules/Event/TAP/*.t t/Test2/modules/EventFacet/*.t
t/Test2/modules/Formatter/*.t t/Test2/modules/Hub/*.t
t/Test2/modules/Hub/Interceptor/*.t t/Test2/modules/IPC/*.t
t/Test2/modules/IPC/Driver/*.t t/Test2/modules/Tools/*.t
t/Test2/modules/Util/*.t t/Test2/regression/*.t t/regression/*.t"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test/Builder/Formatter.pm
new/Test-Simple-1.302177/lib/Test/Builder/Formatter.pm
--- old/Test-Simple-1.302175/lib/Test/Builder/Formatter.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test/Builder/Formatter.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN { require Test2::Formatter::TAP; our @ISA = qw(Test2::Formatter::TAP) }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test/Builder/Module.pm
new/Test-Simple-1.302177/lib/Test/Builder/Module.pm
--- old/Test-Simple-1.302175/lib/Test/Builder/Module.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test/Builder/Module.pm 2020-08-07
06:46:07.000000000 +0200
@@ -7,7 +7,7 @@
require Exporter;
our @ISA = qw(Exporter);
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
=head1 NAME
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Test-Simple-1.302175/lib/Test/Builder/Tester/Color.pm
new/Test-Simple-1.302177/lib/Test/Builder/Tester/Color.pm
--- old/Test-Simple-1.302175/lib/Test/Builder/Tester/Color.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test/Builder/Tester/Color.pm 2020-08-07
06:46:07.000000000 +0200
@@ -1,7 +1,7 @@
package Test::Builder::Tester::Color;
use strict;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
require Test::Builder::Tester;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test/Builder/Tester.pm
new/Test-Simple-1.302177/lib/Test/Builder/Tester.pm
--- old/Test-Simple-1.302175/lib/Test/Builder/Tester.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test/Builder/Tester.pm 2020-08-07
06:46:07.000000000 +0200
@@ -1,7 +1,7 @@
package Test::Builder::Tester;
use strict;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Test::Builder;
use Symbol;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test/Builder/TodoDiag.pm
new/Test-Simple-1.302177/lib/Test/Builder/TodoDiag.pm
--- old/Test-Simple-1.302175/lib/Test/Builder/TodoDiag.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test/Builder/TodoDiag.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN { require Test2::Event::Diag; our @ISA = qw(Test2::Event::Diag) }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test/Builder.pm
new/Test-Simple-1.302177/lib/Test/Builder.pm
--- old/Test-Simple-1.302175/lib/Test/Builder.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test/Builder.pm 2020-08-07
06:46:07.000000000 +0200
@@ -4,7 +4,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN {
if( $] < 5.008 ) {
@@ -51,40 +51,80 @@
#$hub->add_context_aquire(sub {$_[0]->{level} += $Level - 1});
- $hub->pre_filter(sub {
- my ($active_hub, $e) = @_;
+ $hub->pre_filter(
+ sub {
+ my ($active_hub, $e) = @_;
+
+ my $epkg = $$epkgr;
+ my $cpkg = $e->{trace} ? $e->{trace}->{frame}->[0] : undef;
+
+ no strict 'refs';
+ no warnings 'once';
+ my $todo;
+ $todo = ${"$cpkg\::TODO"} if $cpkg;
+ $todo = ${"$epkg\::TODO"} if $epkg && !$todo;
+
+ return $e unless defined($todo);
+ return $e unless length($todo);
+
+ # Turn a diag into a todo diag
+ return Test::Builder::TodoDiag->new(%$e) if ref($e) eq
'Test2::Event::Diag';
+
+ $e->set_todo($todo) if $e->can('set_todo');
+ $e->add_amnesty({tag => 'TODO', details => $todo});
+
+ # Set todo on ok's
+ if ($e->isa('Test2::Event::Ok')) {
+ $e->set_effective_pass(1);
+
+ if (my $result = $e->get_meta(__PACKAGE__)) {
+ $result->{reason} ||= $todo;
+ $result->{type} ||= 'todo';
+ $result->{ok} = 1;
+ }
+ }
- my $epkg = $$epkgr;
- my $cpkg = $e->{trace} ? $e->{trace}->{frame}->[0] : undef;
+ return $e;
+ },
- no strict 'refs';
- no warnings 'once';
- my $todo;
- $todo = ${"$cpkg\::TODO"} if $cpkg;
- $todo = ${"$epkg\::TODO"} if $epkg && !$todo;
-
- return $e unless defined($todo);
- return $e unless length($todo);
-
- # Turn a diag into a todo diag
- return Test::Builder::TodoDiag->new(%$e) if ref($e) eq
'Test2::Event::Diag';
-
- $e->set_todo($todo) if $e->can('set_todo');
- $e->add_amnesty({tag => 'TODO', details => $todo});
-
- # Set todo on ok's
- if ($e->isa('Test2::Event::Ok')) {
- $e->set_effective_pass(1);
-
- if (my $result = $e->get_meta(__PACKAGE__)) {
- $result->{reason} ||= $todo;
- $result->{type} ||= 'todo';
- $result->{ok} = 1;
- }
- }
+ inherit => 1,
- return $e;
- }, inherit => 1);
+ intercept_inherit => {
+ clean => sub {
+ my %params = @_;
+
+ my $state = $params{state};
+ my $trace = $params{trace};
+
+ my $epkg = $$epkgr;
+ my $cpkg = $trace->{frame}->[0];
+
+ no strict 'refs';
+ no warnings 'once';
+
+ $state->{+__PACKAGE__} = {};
+ $state->{+__PACKAGE__}->{"$cpkg\::TODO"} = ${"$cpkg\::TODO"}
if $cpkg;
+ $state->{+__PACKAGE__}->{"$epkg\::TODO"} = ${"$epkg\::TODO"}
if $epkg;
+
+ ${"$cpkg\::TODO"} = undef if $cpkg;
+ ${"$epkg\::TODO"} = undef if $epkg;
+ },
+ restore => sub {
+ my %params = @_;
+ my $state = $params{state};
+
+ no strict 'refs';
+ no warnings 'once';
+
+ for my $item (keys %{$state->{+__PACKAGE__}}) {
+ no strict 'refs';
+ no warnings 'once';
+
+ ${"$item"} = $state->{+__PACKAGE__}->{$item};
+ }
+ },
+ },
+ );
}
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test/More.pm
new/Test-Simple-1.302177/lib/Test/More.pm
--- old/Test-Simple-1.302175/lib/Test/More.pm 2020-04-13 20:37:37.000000000
+0200
+++ new/Test-Simple-1.302177/lib/Test/More.pm 2020-08-07 06:46:07.000000000
+0200
@@ -17,7 +17,7 @@
return warn @_, " at $file line $line\n";
}
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Test::Builder::Module;
our @ISA = qw(Test::Builder::Module);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test/Simple.pm
new/Test-Simple-1.302177/lib/Test/Simple.pm
--- old/Test-Simple-1.302175/lib/Test/Simple.pm 2020-04-13 20:37:37.000000000
+0200
+++ new/Test-Simple-1.302177/lib/Test/Simple.pm 2020-08-07 06:46:07.000000000
+0200
@@ -4,7 +4,7 @@
use strict;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Test::Builder::Module;
our @ISA = qw(Test::Builder::Module);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test/Tester/Capture.pm
new/Test-Simple-1.302177/lib/Test/Tester/Capture.pm
--- old/Test-Simple-1.302175/lib/Test/Tester/Capture.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test/Tester/Capture.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
package Test::Tester::Capture;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Test::Builder;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Test-Simple-1.302175/lib/Test/Tester/CaptureRunner.pm
new/Test-Simple-1.302177/lib/Test/Tester/CaptureRunner.pm
--- old/Test-Simple-1.302175/lib/Test/Tester/CaptureRunner.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test/Tester/CaptureRunner.pm 2020-08-07
06:46:07.000000000 +0200
@@ -3,7 +3,7 @@
package Test::Tester::CaptureRunner;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Test::Tester::Capture;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test/Tester/Delegate.pm
new/Test-Simple-1.302177/lib/Test/Tester/Delegate.pm
--- old/Test-Simple-1.302175/lib/Test/Tester/Delegate.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test/Tester/Delegate.pm 2020-08-07
06:46:07.000000000 +0200
@@ -3,7 +3,7 @@
package Test::Tester::Delegate;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Scalar::Util();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test/Tester.pm
new/Test-Simple-1.302177/lib/Test/Tester.pm
--- old/Test-Simple-1.302175/lib/Test/Tester.pm 2020-04-13 20:37:37.000000000
+0200
+++ new/Test-Simple-1.302177/lib/Test/Tester.pm 2020-08-07 06:46:07.000000000
+0200
@@ -18,7 +18,7 @@
use vars qw( @ISA @EXPORT );
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
@EXPORT = qw( run_tests check_tests check_test cmp_results show_space );
@ISA = qw( Exporter );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test/use/ok.pm
new/Test-Simple-1.302177/lib/Test/use/ok.pm
--- old/Test-Simple-1.302175/lib/Test/use/ok.pm 2020-04-13 20:37:37.000000000
+0200
+++ new/Test-Simple-1.302177/lib/Test/use/ok.pm 2020-08-07 06:46:07.000000000
+0200
@@ -1,7 +1,7 @@
package Test::use::ok;
use 5.005;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
__END__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/API/Breakage.pm
new/Test-Simple-1.302177/lib/Test2/API/Breakage.pm
--- old/Test-Simple-1.302175/lib/Test2/API/Breakage.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/API/Breakage.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Test2::Util qw/pkg_to_file/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/API/Context.pm
new/Test-Simple-1.302177/lib/Test2/API/Context.pm
--- old/Test-Simple-1.302175/lib/Test2/API/Context.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/API/Context.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Carp qw/confess croak/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/API/Instance.pm
new/Test-Simple-1.302177/lib/Test2/API/Instance.pm
--- old/Test-Simple-1.302175/lib/Test2/API/Instance.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/API/Instance.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
our @CARP_NOT = qw/Test2::API Test2::API::Instance Test2::IPC::Driver
Test2::Formatter/;
use Carp qw/confess carp/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/API/Stack.pm
new/Test-Simple-1.302177/lib/Test2/API/Stack.pm
--- old/Test-Simple-1.302175/lib/Test2/API/Stack.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/API/Stack.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Test2::Hub();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/API.pm
new/Test-Simple-1.302177/lib/Test2/API.pm
--- old/Test-Simple-1.302175/lib/Test2/API.pm 2020-04-13 20:37:37.000000000
+0200
+++ new/Test-Simple-1.302177/lib/Test2/API.pm 2020-08-07 06:46:07.000000000
+0200
@@ -9,7 +9,7 @@
$ENV{TEST2_ACTIVE} = 1;
}
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
my $INST;
@@ -595,6 +595,10 @@
$ctx->stack->top; # Make sure there is a top hub before we begin.
$ctx->stack->push($hub);
+ my $trace = $ctx->trace;
+ my $state = {};
+ $hub->clean_inherited(trace => $trace, state => $state);
+
my ($ok, $err) = (1, undef);
T2_SUBTEST_WRAPPER: {
# Do not use 'try' cause it localizes __DIE__
@@ -611,7 +615,8 @@
$hub->cull;
$ctx->stack->pop($hub);
- my $trace = $ctx->trace;
+ $hub->restore_inherited(trace => $trace, state => $state);
+
$ctx->release;
die $err unless $ok;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Event/Bail.pm
new/Test-Simple-1.302177/lib/Test2/Event/Bail.pm
--- old/Test-Simple-1.302175/lib/Test2/Event/Bail.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Event/Bail.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Event/Diag.pm
new/Test-Simple-1.302177/lib/Test2/Event/Diag.pm
--- old/Test-Simple-1.302175/lib/Test2/Event/Diag.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Event/Diag.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Event/Encoding.pm
new/Test-Simple-1.302177/lib/Test2/Event/Encoding.pm
--- old/Test-Simple-1.302175/lib/Test2/Event/Encoding.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Event/Encoding.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Carp qw/croak/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Event/Exception.pm
new/Test-Simple-1.302177/lib/Test2/Event/Exception.pm
--- old/Test-Simple-1.302175/lib/Test2/Event/Exception.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Event/Exception.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Event/Fail.pm
new/Test-Simple-1.302177/lib/Test2/Event/Fail.pm
--- old/Test-Simple-1.302175/lib/Test2/Event/Fail.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Event/Fail.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Test2::EventFacet::Info;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Event/Generic.pm
new/Test-Simple-1.302177/lib/Test2/Event/Generic.pm
--- old/Test-Simple-1.302175/lib/Test2/Event/Generic.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Event/Generic.pm 2020-08-07
06:46:07.000000000 +0200
@@ -5,7 +5,7 @@
use Carp qw/croak/;
use Scalar::Util qw/reftype/;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }
use Test2::Util::HashBase;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Event/Note.pm
new/Test-Simple-1.302177/lib/Test2/Event/Note.pm
--- old/Test-Simple-1.302175/lib/Test2/Event/Note.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Event/Note.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Event/Ok.pm
new/Test-Simple-1.302177/lib/Test2/Event/Ok.pm
--- old/Test-Simple-1.302175/lib/Test2/Event/Ok.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Event/Ok.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }
@@ -69,7 +69,14 @@
};
if (my @exra_amnesty = $self->extra_amnesty) {
- unshift @{$out->{amnesty}} => @exra_amnesty;
+ my %seen;
+
+ # It is possible the extra amnesty can be a duplicate, so filter it.
+ $out->{amnesty} = [
+ grep { !$seen{defined($_->{tag}) ? $_->{tag} :
''}->{defined($_->{details}) ? $_->{details} : ''}++ }
+ @exra_amnesty,
+ @{$out->{amnesty}},
+ ];
}
return $out;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Event/Pass.pm
new/Test-Simple-1.302177/lib/Test2/Event/Pass.pm
--- old/Test-Simple-1.302175/lib/Test2/Event/Pass.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Event/Pass.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Test2::EventFacet::Info;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Event/Plan.pm
new/Test-Simple-1.302177/lib/Test2/Event/Plan.pm
--- old/Test-Simple-1.302175/lib/Test2/Event/Plan.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Event/Plan.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Event/Skip.pm
new/Test-Simple-1.302177/lib/Test2/Event/Skip.pm
--- old/Test-Simple-1.302175/lib/Test2/Event/Skip.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Event/Skip.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN { require Test2::Event::Ok; our @ISA = qw(Test2::Event::Ok) }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Event/Subtest.pm
new/Test-Simple-1.302177/lib/Test2/Event/Subtest.pm
--- old/Test-Simple-1.302175/lib/Test2/Event/Subtest.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Event/Subtest.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN { require Test2::Event::Ok; our @ISA = qw(Test2::Event::Ok) }
use Test2::Util::HashBase qw{subevents buffered subtest_id subtest_uuid};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Event/TAP/Version.pm
new/Test-Simple-1.302177/lib/Test2/Event/TAP/Version.pm
--- old/Test-Simple-1.302175/lib/Test2/Event/TAP/Version.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Event/TAP/Version.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Carp qw/croak/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Event/V2.pm
new/Test-Simple-1.302177/lib/Test2/Event/V2.pm
--- old/Test-Simple-1.302175/lib/Test2/Event/V2.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Event/V2.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Scalar::Util qw/reftype/;
use Carp qw/croak/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Event/Waiting.pm
new/Test-Simple-1.302177/lib/Test2/Event/Waiting.pm
--- old/Test-Simple-1.302175/lib/Test2/Event/Waiting.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Event/Waiting.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Event.pm
new/Test-Simple-1.302177/lib/Test2/Event.pm
--- old/Test-Simple-1.302175/lib/Test2/Event.pm 2020-04-13 20:37:37.000000000
+0200
+++ new/Test-Simple-1.302177/lib/Test2/Event.pm 2020-08-07 06:46:07.000000000
+0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Scalar::Util qw/blessed reftype/;
use Carp qw/croak/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/EventFacet/About.pm
new/Test-Simple-1.302177/lib/Test2/EventFacet/About.pm
--- old/Test-Simple-1.302175/lib/Test2/EventFacet/About.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/EventFacet/About.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN { require Test2::EventFacet; our @ISA = qw(Test2::EventFacet) }
use Test2::Util::HashBase qw{ -package -no_display -uuid -eid };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/EventFacet/Amnesty.pm
new/Test-Simple-1.302177/lib/Test2/EventFacet/Amnesty.pm
--- old/Test-Simple-1.302175/lib/Test2/EventFacet/Amnesty.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/EventFacet/Amnesty.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
sub is_list { 1 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/EventFacet/Assert.pm
new/Test-Simple-1.302177/lib/Test2/EventFacet/Assert.pm
--- old/Test-Simple-1.302175/lib/Test2/EventFacet/Assert.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/EventFacet/Assert.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN { require Test2::EventFacet; our @ISA = qw(Test2::EventFacet) }
use Test2::Util::HashBase qw{ -pass -no_debug -number };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/EventFacet/Control.pm
new/Test-Simple-1.302177/lib/Test2/EventFacet/Control.pm
--- old/Test-Simple-1.302175/lib/Test2/EventFacet/Control.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/EventFacet/Control.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN { require Test2::EventFacet; our @ISA = qw(Test2::EventFacet) }
use Test2::Util::HashBase qw{ -global -terminate -halt -has_callback -encoding
-phase };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/EventFacet/Error.pm
new/Test-Simple-1.302177/lib/Test2/EventFacet/Error.pm
--- old/Test-Simple-1.302175/lib/Test2/EventFacet/Error.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/EventFacet/Error.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
sub facet_key { 'errors' }
sub is_list { 1 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/EventFacet/Hub.pm
new/Test-Simple-1.302177/lib/Test2/EventFacet/Hub.pm
--- old/Test-Simple-1.302175/lib/Test2/EventFacet/Hub.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/EventFacet/Hub.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
sub is_list { 1 }
sub facet_key { 'hubs' }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Test-Simple-1.302175/lib/Test2/EventFacet/Info/Table.pm
new/Test-Simple-1.302177/lib/Test2/EventFacet/Info/Table.pm
--- old/Test-Simple-1.302175/lib/Test2/EventFacet/Info/Table.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/EventFacet/Info/Table.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Carp qw/confess/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/EventFacet/Info.pm
new/Test-Simple-1.302177/lib/Test2/EventFacet/Info.pm
--- old/Test-Simple-1.302175/lib/Test2/EventFacet/Info.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/EventFacet/Info.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
sub is_list { 1 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/EventFacet/Meta.pm
new/Test-Simple-1.302177/lib/Test2/EventFacet/Meta.pm
--- old/Test-Simple-1.302175/lib/Test2/EventFacet/Meta.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/EventFacet/Meta.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN { require Test2::EventFacet; our @ISA = qw(Test2::EventFacet) }
use vars qw/$AUTOLOAD/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/EventFacet/Parent.pm
new/Test-Simple-1.302177/lib/Test2/EventFacet/Parent.pm
--- old/Test-Simple-1.302175/lib/Test2/EventFacet/Parent.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/EventFacet/Parent.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Carp qw/confess/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/EventFacet/Plan.pm
new/Test-Simple-1.302177/lib/Test2/EventFacet/Plan.pm
--- old/Test-Simple-1.302175/lib/Test2/EventFacet/Plan.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/EventFacet/Plan.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN { require Test2::EventFacet; our @ISA = qw(Test2::EventFacet) }
use Test2::Util::HashBase qw{ -count -skip -none };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/EventFacet/Render.pm
new/Test-Simple-1.302177/lib/Test2/EventFacet/Render.pm
--- old/Test-Simple-1.302175/lib/Test2/EventFacet/Render.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/EventFacet/Render.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
sub is_list { 1 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/EventFacet/Trace.pm
new/Test-Simple-1.302177/lib/Test2/EventFacet/Trace.pm
--- old/Test-Simple-1.302175/lib/Test2/EventFacet/Trace.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/EventFacet/Trace.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN { require Test2::EventFacet; our @ISA = qw(Test2::EventFacet) }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/EventFacet.pm
new/Test-Simple-1.302177/lib/Test2/EventFacet.pm
--- old/Test-Simple-1.302175/lib/Test2/EventFacet.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/EventFacet.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Test2::Util::HashBase qw/-details/;
use Carp qw/croak/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Formatter/TAP.pm
new/Test-Simple-1.302177/lib/Test2/Formatter/TAP.pm
--- old/Test-Simple-1.302175/lib/Test2/Formatter/TAP.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Formatter/TAP.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Test2::Util qw/clone_io/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Formatter.pm
new/Test-Simple-1.302177/lib/Test2/Formatter.pm
--- old/Test-Simple-1.302175/lib/Test2/Formatter.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Formatter.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
my %ADDED;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Test-Simple-1.302175/lib/Test2/Hub/Interceptor/Terminator.pm
new/Test-Simple-1.302177/lib/Test2/Hub/Interceptor/Terminator.pm
--- old/Test-Simple-1.302175/lib/Test2/Hub/Interceptor/Terminator.pm
2020-04-13 20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Hub/Interceptor/Terminator.pm
2020-08-07 06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Hub/Interceptor.pm
new/Test-Simple-1.302177/lib/Test2/Hub/Interceptor.pm
--- old/Test-Simple-1.302175/lib/Test2/Hub/Interceptor.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Hub/Interceptor.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Test2::Hub::Interceptor::Terminator();
@@ -27,6 +27,62 @@
$self->{+IPC} = $ipc;
$ipc->add_hub($self->{+HID});
}
+
+ if (my $ls = $from->{+_LISTENERS}) {
+ push @{$self->{+_LISTENERS}} => grep { $_->{intercept_inherit} } @$ls;
+ }
+
+ if (my $pfs = $from->{+_PRE_FILTERS}) {
+ push @{$self->{+_PRE_FILTERS}} => grep { $_->{intercept_inherit} }
@$pfs;
+ }
+
+ if (my $fs = $from->{+_FILTERS}) {
+ push @{$self->{+_FILTERS}} => grep { $_->{intercept_inherit} } @$fs;
+ }
+}
+
+sub clean_inherited {
+ my $self = shift;
+ my %params = @_;
+
+ my @sets = (
+ $self->{+_LISTENERS},
+ $self->{+_PRE_FILTERS},
+ $self->{+_FILTERS},
+ );
+
+ for my $set (@sets) {
+ next unless $set;
+
+ for my $i (@$set) {
+ my $cbs = $i->{intercept_inherit} or next;
+ next unless ref($cbs) eq 'HASH';
+ my $cb = $cbs->{clean} or next;
+ $cb->(%params);
+ }
+ }
+}
+
+sub restore_inherited {
+ my $self = shift;
+ my %params = @_;
+
+ my @sets = (
+ $self->{+_FILTERS},
+ $self->{+_PRE_FILTERS},
+ $self->{+_LISTENERS},
+ );
+
+ for my $set (@sets) {
+ next unless $set;
+
+ for my $i (@$set) {
+ my $cbs = $i->{intercept_inherit} or next;
+ next unless ref($cbs) eq 'HASH';
+ my $cb = $cbs->{restore} or next;
+ $cb->(%params);
+ }
+ }
}
sub terminate {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Hub/Subtest.pm
new/Test-Simple-1.302177/lib/Test2/Hub/Subtest.pm
--- old/Test-Simple-1.302175/lib/Test2/Hub/Subtest.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Hub/Subtest.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN { require Test2::Hub; our @ISA = qw(Test2::Hub) }
use Test2::Util::HashBase qw/nested exit_code manual_skip_all/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Hub.pm
new/Test-Simple-1.302177/lib/Test2/Hub.pm
--- old/Test-Simple-1.302175/lib/Test2/Hub.pm 2020-04-13 20:37:37.000000000
+0200
+++ new/Test-Simple-1.302177/lib/Test2/Hub.pm 2020-08-07 06:46:07.000000000
+0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Carp qw/carp croak confess/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/IPC/Driver/Files.pm
new/Test-Simple-1.302177/lib/Test2/IPC/Driver/Files.pm
--- old/Test-Simple-1.302175/lib/Test2/IPC/Driver/Files.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/IPC/Driver/Files.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN { require Test2::IPC::Driver; our @ISA = qw(Test2::IPC::Driver) }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/IPC/Driver.pm
new/Test-Simple-1.302177/lib/Test2/IPC/Driver.pm
--- old/Test-Simple-1.302175/lib/Test2/IPC/Driver.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/IPC/Driver.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Carp qw/confess/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/IPC.pm
new/Test-Simple-1.302177/lib/Test2/IPC.pm
--- old/Test-Simple-1.302175/lib/Test2/IPC.pm 2020-04-13 20:37:37.000000000
+0200
+++ new/Test-Simple-1.302177/lib/Test2/IPC.pm 2020-08-07 06:46:07.000000000
+0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Test2::API::Instance;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Tools/Tiny.pm
new/Test-Simple-1.302177/lib/Test2/Tools/Tiny.pm
--- old/Test-Simple-1.302175/lib/Test2/Tools/Tiny.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Tools/Tiny.pm 2020-08-07
06:46:07.000000000 +0200
@@ -16,7 +16,7 @@
use Test2::Hub::Interceptor();
use Test2::Hub::Interceptor::Terminator();
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
BEGIN { require Exporter; our @ISA = qw(Exporter) }
our @EXPORT = qw{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Util/ExternalMeta.pm
new/Test-Simple-1.302177/lib/Test2/Util/ExternalMeta.pm
--- old/Test-Simple-1.302175/lib/Test2/Util/ExternalMeta.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Util/ExternalMeta.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Carp qw/croak/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Util/Facets2Legacy.pm
new/Test-Simple-1.302177/lib/Test2/Util/Facets2Legacy.pm
--- old/Test-Simple-1.302175/lib/Test2/Util/Facets2Legacy.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Util/Facets2Legacy.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use Carp qw/croak confess/;
use Scalar::Util qw/blessed/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Util/HashBase.pm
new/Test-Simple-1.302177/lib/Test2/Util/HashBase.pm
--- old/Test-Simple-1.302175/lib/Test2/Util/HashBase.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Util/HashBase.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
#################################################################
# #
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Util/Trace.pm
new/Test-Simple-1.302177/lib/Test2/Util/Trace.pm
--- old/Test-Simple-1.302175/lib/Test2/Util/Trace.pm 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/Test2/Util/Trace.pm 2020-08-07
06:46:07.000000000 +0200
@@ -2,7 +2,7 @@
require Test2::EventFacet::Trace;
@ISA = ('Test2::EventFacet::Trace');
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2/Util.pm
new/Test-Simple-1.302177/lib/Test2/Util.pm
--- old/Test-Simple-1.302175/lib/Test2/Util.pm 2020-04-13 20:37:37.000000000
+0200
+++ new/Test-Simple-1.302177/lib/Test2/Util.pm 2020-08-07 06:46:07.000000000
+0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use POSIX();
use Config qw/%Config/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/Test2.pm
new/Test-Simple-1.302177/lib/Test2.pm
--- old/Test-Simple-1.302175/lib/Test2.pm 2020-04-13 20:37:37.000000000
+0200
+++ new/Test-Simple-1.302177/lib/Test2.pm 2020-08-07 06:46:07.000000000
+0200
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/lib/ok.pm
new/Test-Simple-1.302177/lib/ok.pm
--- old/Test-Simple-1.302175/lib/ok.pm 2020-04-13 20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/lib/ok.pm 2020-08-07 06:46:07.000000000 +0200
@@ -1,5 +1,5 @@
package ok;
-our $VERSION = '1.302175';
+our $VERSION = '1.302177';
use strict;
use Test::More ();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/t/Legacy/Builder/current_test.t
new/Test-Simple-1.302177/t/Legacy/Builder/current_test.t
--- old/Test-Simple-1.302175/t/Legacy/Builder/current_test.t 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/t/Legacy/Builder/current_test.t 2020-08-07
06:46:07.000000000 +0200
@@ -3,8 +3,11 @@
# Dave Rolsky found a bug where if current_test() is used and no
# tests are run via Test::Builder it will blow up.
+use strict;
+use warnings;
+
use Test::Builder;
-$TB = Test::Builder->new;
+my $TB = Test::Builder->new;
$TB->plan(tests => 2);
print "ok 1\n";
print "ok 2\n";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/t/Legacy/buffer.t
new/Test-Simple-1.302177/t/Legacy/buffer.t
--- old/Test-Simple-1.302175/t/Legacy/buffer.t 2020-04-13 20:37:37.000000000
+0200
+++ new/Test-Simple-1.302177/t/Legacy/buffer.t 2020-08-07 06:46:07.000000000
+0200
@@ -1,6 +1,9 @@
#!/usr/bin/perl
# HARNESS-NO-STREAM
+use strict;
+use warnings;
+
BEGIN {
if( $ENV{PERL_CORE} ) {
chdir 't';
@@ -16,7 +19,7 @@
$T->no_ending(1);
for my $num (1..10) {
- $tnum = $num * 2;
+ my $tnum = $num * 2;
pass("I'm ok");
$T->current_test($tnum);
print "ok $tnum - You're ok\n";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/t/Legacy/fail-like.t
new/Test-Simple-1.302177/t/Legacy/fail-like.t
--- old/Test-Simple-1.302175/t/Legacy/fail-like.t 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/t/Legacy/fail-like.t 2020-08-07
06:46:07.000000000 +0200
@@ -16,6 +16,7 @@
# This tests against that.
use strict;
+use warnings;
# Can't use Test.pm, that's a 5.005 thing.
@@ -58,14 +59,14 @@
}
{
- # line 62
+ # line 63
like("foo", "not a regex");
$TB->is_eq($out->read, <<OUT);
not ok 2
OUT
$TB->is_eq($err->read, <<OUT);
-# Failed test at $0 line 62.
+# Failed test at $0 line 63.
# 'not a regex' doesn't look much like a regex to me.
OUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/t/Legacy/is_deeply_fail.t
new/Test-Simple-1.302177/t/Legacy/is_deeply_fail.t
--- old/Test-Simple-1.302175/t/Legacy/is_deeply_fail.t 2020-04-13
20:37:37.000000000 +0200
+++ new/Test-Simple-1.302177/t/Legacy/is_deeply_fail.t 2020-08-07
06:46:07.000000000 +0200
@@ -11,6 +11,7 @@
}
use strict;
+use warnings;
use Test::Builder;
require Test::Simple::Catch;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Simple-1.302175/t/Legacy/todo.t
new/Test-Simple-1.302177/t/Legacy/todo.t
--- old/Test-Simple-1.302175/t/Legacy/todo.t 2020-04-13 20:37:37.000000000
+0200
+++ new/Test-Simple-1.302177/t/Legacy/todo.t 2020-08-07 06:46:07.000000000
+0200
@@ -9,10 +9,13 @@
use Test::More;
+use strict;
+use warnings;
+
plan tests => 36;
-$Why = 'Just testing the todo interface.';
+my $Why = 'Just testing the todo interface.';
my $is_todo;
TODO: {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Test-Simple-1.302175/t/regression/862-intercept_tb_todo.t
new/Test-Simple-1.302177/t/regression/862-intercept_tb_todo.t
--- old/Test-Simple-1.302175/t/regression/862-intercept_tb_todo.t
1970-01-01 01:00:00.000000000 +0100
+++ new/Test-Simple-1.302177/t/regression/862-intercept_tb_todo.t
2020-08-07 06:46:07.000000000 +0200
@@ -0,0 +1,62 @@
+use strict;
+use warnings;
+
+use Test::More;
+use Test2::API qw/intercept/;
+
+my $events;
+{
+ local $TODO = "main-outer-todo";
+
+ package Foo;
+
+ our $TODO;
+ local $TODO = "foo-outer-todo";
+
+ $events = main::intercept(sub {
+ main::ok(1, "assertion 1");
+
+ {
+ local $main::TODO = "main-inner-todo";
+ main::ok(1, "assertion 2");
+ }
+
+ {
+ local $Foo::TODO = "foo-inner-todo";
+ main::ok(1, "assertion 3");
+ }
+
+ main::ok(1, "assertion 4");
+ });
+
+ # Cannot use intercept, so make a failing test, the overall test file
+ # should still pass because this is todo. If this is not todo we know we
+ # broke something by the test failing overall.
+ main::ok(0, "Verifying todo, this should be a failed todo test");
+}
+
+@$events = grep { $_->facet_data->{assert} } @$events;
+
+ok(!$events->[0]->facet_data->{amnesty}, "No amnesty for the first event,
\$TODO was cleaned");
+
+is_deeply(
+ $events->[1]->facet_data->{amnesty},
+ [{
+ tag => 'TODO',
+ details => 'main-inner-todo',
+ }],
+ "The second event had the expected amnesty applied",
+);
+
+is_deeply(
+ $events->[2]->facet_data->{amnesty},
+ [{
+ tag => 'TODO',
+ details => 'foo-inner-todo',
+ }],
+ "The third event had the expected amnesty applied",
+);
+
+ok(!$events->[3]->facet_data->{amnesty}, "No amnesty for the fourth event,
\$TODO was cleaned");
+
+done_testing;
