[libtest2-perl] 03/04: Drop spelling.patch, merged upstream.
gregor herrmann
gregoa at debian.org
Mon Mar 21 20:50:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libtest2-perl.
commit 9cd2e9f286d7118c084934eb557f9c98004d496b
Author: gregor herrmann <gregoa at debian.org>
Date: Mon Mar 21 21:38:41 2016 +0100
Drop spelling.patch, merged upstream.
---
debian/patches/series | 1 -
debian/patches/spelling.patch | 515 ------------------------------------------
2 files changed, 516 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5299247..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-spelling.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
deleted file mode 100644
index f045582..0000000
--- a/debian/patches/spelling.patch
+++ /dev/null
@@ -1,515 +0,0 @@
-Description: fix spelling, in POD and also function names
-Origin: vendor
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2016-03-18
-Forwarded: https://github.com/Test-More/Test2/issues/11
-Bug: https://github.com/Test-More/Test2/issues/11
-
---- a/Changes
-+++ b/Changes
-@@ -33,7 +33,7 @@
- 0.000023 2016-01-28 20:34:09-08:00 America/Los_Angeles
-
- - Add context_do()
-- - Add context_aquire hooks
-+ - Add context_acquire hooks
- - Documentation updates
- - Typo fixes (thanks rjbs)
- - Minor enhancement to test tools
---- a/lib/Test2/API.pm
-+++ b/lib/Test2/API.pm
-@@ -44,12 +44,12 @@ our @EXPORT_OK = qw{
- test2_stack
- test2_no_wait
-
-- test2_add_callback_context_aquire
-+ test2_add_callback_context_acquire
- test2_add_callback_context_init
- test2_add_callback_context_release
- test2_add_callback_exit
- test2_add_callback_post_load
-- test2_list_context_aquire_callbacks
-+ test2_list_context_acquire_callbacks
- test2_list_context_init_callbacks
- test2_list_context_release_callbacks
- test2_list_exit_callbacks
-@@ -91,10 +91,10 @@ sub import {
- goto &import;
- }
-
--my $STACK = $INST->stack;
--my $CONTEXTS = $INST->contexts;
--my $INIT_CBS = $INST->context_init_callbacks;
--my $AQUIRE_CBS = $INST->context_aquire_callbacks;
-+my $STACK = $INST->stack;
-+my $CONTEXTS = $INST->contexts;
-+my $INIT_CBS = $INST->context_init_callbacks;
-+my $ACQUIRE_CBS = $INST->context_acquire_callbacks;
-
- sub test2_init_done { $INST->finalized }
- sub test2_load_done { $INST->loaded }
-@@ -107,12 +107,12 @@ sub test2_no_wait {
- $INST->no_wait;
- }
-
--sub test2_add_callback_context_aquire { $INST->add_context_aquire_callback(@_) }
-+sub test2_add_callback_context_acquire { $INST->add_context_acquire_callback(@_) }
- sub test2_add_callback_context_init { $INST->add_context_init_callback(@_) }
- sub test2_add_callback_context_release { $INST->add_context_release_callback(@_) }
- sub test2_add_callback_exit { $INST->add_exit_callback(@_) }
- sub test2_add_callback_post_load { $INST->add_post_load_callback(@_) }
--sub test2_list_context_aquire_callbacks { @{$INST->context_aquire_callbacks} }
-+sub test2_list_context_acquire_callbacks { @{$INST->context_acquire_callbacks} }
- sub test2_list_context_init_callbacks { @{$INST->context_init_callbacks} }
- sub test2_list_context_release_callbacks { @{$INST->context_release_callbacks} }
- sub test2_list_exit_callbacks { @{$INST->exit_callbacks} }
-@@ -140,7 +140,7 @@ sub test2_formatter_set {
-
- # Private, for use in Test2::API::Context
- sub _contexts_ref { $INST->contexts }
--sub _context_aquire_callbacks_ref { $INST->context_aquire_callbacks }
-+sub _context_acquire_callbacks_ref { $INST->context_acquire_callbacks }
- sub _context_init_callbacks_ref { $INST->context_init_callbacks }
- sub _context_release_callbacks_ref { $INST->context_release_callbacks }
-
-@@ -209,8 +209,8 @@ sub context {
- my $hid = $hub->{hid};
- my $current = $CONTEXTS->{$hid};
-
-- $_->(\%params) for @$AQUIRE_CBS;
-- map $_->(\%params), @{$hub->{_context_aquire}} if $hub->{_context_aquire};
-+ $_->(\%params) for @$ACQUIRE_CBS;
-+ map $_->(\%params), @{$hub->{_context_acquire}} if $hub->{_context_acquire};
-
- my $level = 1 + $params{level};
- my ($pkg, $file, $line, $sub) = caller($level);
-@@ -778,7 +778,7 @@ Usage:
- }
-
- Using this inside your test tool takes care of a lot of boilerplate for you. It
--will ensure a context is aquired. It will capture and rethrow any exception. It
-+will ensure a context is acquired. It will capture and rethrow any exception. It
- will insure the context is released when you are done. It preserves the
- subroutine call context (array, scalar, void).
-
-@@ -815,9 +815,9 @@ Useage:
- =back
-
- This tool will hide a context for the provided block of code. This means any
--tools run inside the block will get a completely new context if they aquire
-+tools run inside the block will get a completely new context if they acquire
- one. The new context will be inherited by tools nested below the one that
--aquired it.
-+acquired it.
-
- This will normally hide the current context for the top hub. If you need to
- hide the context for a different hub you can pass in the optional C<$hid>
-@@ -877,7 +877,7 @@ parameters hash. The param hash will be
-
- If this is true, or a hashref with a true value for the 'buffered' key, then
- the subtest will be buffered. In a buffered subtest the child events are hidden
--from the formatter, the formatter will only recieve the final
-+from the formatter, the formatter will only receive the final
- L<Test2:Event::Subtest> event. In an unbuffered subtest the formatter will see
- all events as they happen, as well as the final one.
-
-@@ -966,37 +966,37 @@ Add a callback that will be called when
- means the callback will be run once, the first time a context is obtained.
- If Test2 has already finished loading then the callback will be run immedietly.
-
--=item test2_add_callback_context_aquire(sub { ... })
-+=item test2_add_callback_context_acquire(sub { ... })
-
--Add a callback that will be called every time someone tries to aquire a
-+Add a callback that will be called every time someone tries to acquire a
- context. This will be called on EVERY call to C<context()>. It gets a single
- argument, a reference the the hash of parameters being used the construct the
- context. This is your chance to change the parameters by directly altering the
- hash.
-
-- test2_add_callback_context_aquire(sub {
-+ test2_add_callback_context_acquire(sub {
- my $params = shift;
- $params->{level}++;
- });
-
- This is a very scary API function. Please do not use this unless you need to.
--This is here for L<Test::Builder> and backwards compatability. This has you
-+This is here for L<Test::Builder> and backwards compatibility. This has you
- directly manipulate the hash instead of returning a new one for performance
- reasons.
-
- =item test2_add_callback_context_init(sub { ... })
-
- Add a callback that will be called every time a new context is created. The
--callback will recieve the newly created context as its only argument.
-+callback will receive the newly created context as its only argument.
-
- =item test2_add_callback_context_release(sub { ... })
-
- Add a callback that will be called every time a context is released. The
--callback will recieve the released context as its only argument.
-+callback will receive the released context as its only argument.
-
--=item @list = test2_list_context_aquire_callbacks()
-+=item @list = test2_list_context_acquire_callbacks()
-
--Return all the context aquire callback references.
-+Return all the context acquire callback references.
-
- =item @list = test2_list_context_init_callbacks()
-
---- a/lib/Test2/API/Context.pm
-+++ b/lib/Test2/API/Context.pm
-@@ -466,7 +466,7 @@ This will release the context. This runs
- hooks. It will also restore C<$!>, C<$?>, and C<$@> to what they were when the
- context was created.
-
--B<Note:> If a context is aquired more than once an internal refcount is kept.
-+B<Note:> If a context is acquired more than once an internal refcount is kept.
- C<release()> decrements the ref count, none of the other actions of
- C<release()> will occur unless the refcount hits 0. This means only the last
- call to C<release()> will reset C<$?>, C<$!>, C<$@>,and run the cleanup tasks.
---- a/lib/Test2/API/Instance.pm
-+++ b/lib/Test2/API/Instance.pm
-@@ -29,7 +29,7 @@ use Test2::Util::HashBase qw{
-
- exit_callbacks
- post_load_callbacks
-- context_aquire_callbacks
-+ context_acquire_callbacks
- context_init_callbacks
- context_release_callbacks
- };
-@@ -80,7 +80,7 @@ sub reset {
-
- $self->{+EXIT_CALLBACKS} = [];
- $self->{+POST_LOAD_CALLBACKS} = [];
-- $self->{+CONTEXT_AQUIRE_CALLBACKS} = [];
-+ $self->{+CONTEXT_ACQUIRE_CALLBACKS} = [];
- $self->{+CONTEXT_INIT_CALLBACKS} = [];
- $self->{+CONTEXT_RELEASE_CALLBACKS} = [];
-
-@@ -164,16 +164,16 @@ sub add_formatter {
- carp "Formatter $formatter loaded too late to be used as the global formatter";
- }
-
--sub add_context_aquire_callback {
-+sub add_context_acquire_callback {
- my $self = shift;
- my ($code) = @_;
-
- my $rtype = reftype($code) || "";
-
-- confess "Context-aquire callbacks must be coderefs"
-+ confess "Context-acquire callbacks must be coderefs"
- unless $code && $rtype eq 'CODE';
-
-- push @{$self->{+CONTEXT_AQUIRE_CALLBACKS}} => $code;
-+ push @{$self->{+CONTEXT_ACQUIRE_CALLBACKS}} => $code;
- }
-
- sub add_context_init_callback {
-@@ -502,9 +502,9 @@ stored and executed later when C<load()>
-
- Get a hashref of all active contexts keyed by hub id.
-
--=item $arrayref = $obj->context_aquire_callbacks
-+=item $arrayref = $obj->context_acquire_callbacks
-
--Get all context aquire callbacks.
-+Get all context acquire callbacks.
-
- =item $arrayref = $obj->context_init_callbacks
-
-@@ -576,7 +576,7 @@ Get the list of IPC drivers.
-
- Add an IPC driver to the list. The most recently added IPC driver will become
- the global one during initialization. If a driver is added after initialization
--has occured a warning will be generated:
-+has occurred a warning will be generated:
-
- "IPC driver $driver loaded too late to be used as the global ipc driver"
-
-@@ -637,7 +637,7 @@ Check if a formatter has been set.
- =item $obj->add_formatter($obj)
-
- Add a formatter. The most recently added formatter will become the global one
--during initialization. If a formatter is added after initialization has occured
-+during initialization. If a formatter is added after initialization has occurred
- a warning will be generated:
-
- "Formatter $formatter loaded too late to be used as the global formatter"
---- a/lib/Test2/Hub.pm
-+++ b/lib/Test2/Hub.pm
-@@ -18,7 +18,7 @@ use Test2::Util::HashBase qw{
- _listeners
- _follow_ups
- _formatter
-- _context_aquire
-+ _context_acquire
- _context_init
- _context_release
-
-@@ -182,22 +182,22 @@ sub follow_up {
- push @{$self->{+_FOLLOW_UPS}} => $sub;
- }
-
--sub add_context_aquire {
-+sub add_context_acquire {
- my $self = shift;
- my ($sub) = @_;
-
-- croak "add_context_aquire only takes coderefs for arguments, got '$sub'"
-+ croak "add_context_acquire only takes coderefs for arguments, got '$sub'"
- unless ref $sub && ref $sub eq 'CODE';
-
-- push @{$self->{+_CONTEXT_AQUIRE}} => $sub;
-+ push @{$self->{+_CONTEXT_ACQUIRE}} => $sub;
-
- $sub; # Intentional return.
- }
-
--sub remove_context_aquire {
-+sub remove_context_acquire {
- my $self = shift;
- my %subs = map {$_ => $_} @_;
-- @{$self->{+_CONTEXT_AQUIRE}} = grep { !$subs{$_} == $_ } @{$self->{+_CONTEXT_AQUIRE}};
-+ @{$self->{+_CONTEXT_ACQUIRE}} = grep { !$subs{$_} == $_ } @{$self->{+_CONTEXT_ACQUIRE}};
- }
-
- sub add_context_init {
-@@ -634,20 +634,20 @@ only argument to your codeblock will be
- follow_up subs are called only once, ether when done_testing is called, or in
- an END block.
-
--=item $sub = $hub->add_context_aquire(sub { ... });
-+=item $sub = $hub->add_context_acquire(sub { ... });
-
--Add a callback that will be called every time someone tries to aquire a
-+Add a callback that will be called every time someone tries to acquire a
- context. It gets a single argument, a reference the the hash of parameters
- being used the construct the context. This is your chance to change the
- parameters by directly altering the hash.
-
-- test2_add_callback_context_aquire(sub {
-+ test2_add_callback_context_acquire(sub {
- my $params = shift;
- $params->{level}++;
- });
-
- This is a very scary API function. Please do not use this unless you need to.
--This is here for L<Test::Builder> and backwards compatability. This has you
-+This is here for L<Test::Builder> and backwards compatibility. This has you
- directly manipulate the hash instead of returning a new one for performance
- reasons.
-
-@@ -655,9 +655,9 @@ B<Note> Using this hook could have a hug
-
- The coderef you provide is returned and can be used to remove the hook later.
-
--=item $hub->remove_context_aquire($sub);
-+=item $hub->remove_context_acquire($sub);
-
--This can be used to remove a context aquire hook.
-+This can be used to remove a context acquire hook.
-
- =item $sub = $hub->add_context_init(sub { ... });
-
-@@ -739,7 +739,7 @@ number can be larger than the count).
- =item $bool = $hub->ended
-
- True if the testing has ended. This MAY return the stack frame of the tool that
--ended the test, but that is not guarenteed.
-+ended the test, but that is not guaranteed.
-
- =item $bool = $hub->is_passing
-
---- a/lib/Test2/IPC/Driver.pm
-+++ b/lib/Test2/IPC/Driver.pm
-@@ -91,7 +91,7 @@ C<Carp::longmess> to add a stack trace t
- =item $false = $self->use_shm
-
- The base class always returns false for this method. You may override it if you
--wish to use the SHM made avilable in L<Test2::API>/L<Test2::API::Instance>.
-+wish to use the SHM made available in L<Test2::API>/L<Test2::API::Instance>.
-
- =back
-
-@@ -257,7 +257,7 @@ True if you want to make use of the L<Te
-
- =item $bites = $ipc->shm_size()
-
--Use this to customize the size of the shm space. There are no guarentees about
-+Use this to customize the size of the shm space. There are no guarantees about
- what the size will be if you do not implement this.
-
- =back
---- a/lib/Test2/IPC/Driver/Files.pm
-+++ b/lib/Test2/IPC/Driver/Files.pm
-@@ -310,7 +310,7 @@ This is an experimental release. Using t
-
- This is the default, and fallback concurrency model for L<Test2>. This
- sends events between processes and threads using serialized files in a
--temporary directory. This is not particularily fast, but it works everywhere.
-+temporary directory. This is not particularly fast, but it works everywhere.
-
- =head1 SYNOPSIS
-
---- a/lib/Test2/Util/HashBase.pm
-+++ b/lib/Test2/Util/HashBase.pm
-@@ -212,7 +212,7 @@ Setter, used to set the value of the C<f
-
- =item FOO()
-
--Constant, returs the field C<foo>'s key into the class hashref. Subclasses will
-+Constant, returns the field C<foo>'s key into the class hashref. Subclasses will
- also get this function as a constant, not simply a method, that means it is
- copied into the subclass namespace.
-
---- a/t/modules/API.t
-+++ b/t/modules/API.t
-@@ -238,25 +238,25 @@ sub {
-
- my $sub = sub { };
-
--Test2::API::test2_add_callback_context_aquire($sub);
-+Test2::API::test2_add_callback_context_acquire($sub);
- Test2::API::test2_add_callback_context_init($sub);
- Test2::API::test2_add_callback_context_release($sub);
- Test2::API::test2_add_callback_exit($sub);
- Test2::API::test2_add_callback_post_load($sub);
-
--is((grep { $_ == $sub } Test2::API::test2_list_context_aquire_callbacks()), 1, "got the one instance of the hook");
-+is((grep { $_ == $sub } Test2::API::test2_list_context_acquire_callbacks()), 1, "got the one instance of the hook");
- is((grep { $_ == $sub } Test2::API::test2_list_context_init_callbacks()), 1, "got the one instance of the hook");
- is((grep { $_ == $sub } Test2::API::test2_list_context_release_callbacks()), 1, "got the one instance of the hook");
- is((grep { $_ == $sub } Test2::API::test2_list_exit_callbacks()), 1, "got the one instance of the hook");
- is((grep { $_ == $sub } Test2::API::test2_list_post_load_callbacks()), 1, "got the one instance of the hook");
-
--Test2::API::test2_add_callback_context_aquire($sub);
-+Test2::API::test2_add_callback_context_acquire($sub);
- Test2::API::test2_add_callback_context_init($sub);
- Test2::API::test2_add_callback_context_release($sub);
- Test2::API::test2_add_callback_exit($sub);
- Test2::API::test2_add_callback_post_load($sub);
-
--is((grep { $_ == $sub } Test2::API::test2_list_context_aquire_callbacks()), 2, "got the two instances of the hook");
-+is((grep { $_ == $sub } Test2::API::test2_list_context_acquire_callbacks()), 2, "got the two instances of the hook");
- is((grep { $_ == $sub } Test2::API::test2_list_context_init_callbacks()), 2, "got the two instances of the hook");
- is((grep { $_ == $sub } Test2::API::test2_list_context_release_callbacks()), 2, "got the two instances of the hook");
- is((grep { $_ == $sub } Test2::API::test2_list_exit_callbacks()), 2, "got the two instances of the hook");
---- a/t/modules/API/Context.t
-+++ b/t/modules/API/Context.t
-@@ -6,7 +6,7 @@ BEGIN { require "t/tools.pl" };
- use Test2::API qw{
- context intercept
- test2_stack
-- test2_add_callback_context_aquire
-+ test2_add_callback_context_acquire
- test2_add_callback_context_init
- test2_add_callback_context_release
- };
-@@ -160,8 +160,8 @@ my $ref2 = $hub->add_context_release(sub
- test2_add_callback_context_init(sub { die "Bad Arg" unless ref($_[0]) eq 'Test2::API::Context'; push @hooks => 'global_init' });
- test2_add_callback_context_release(sub { die "Bad Arg" unless ref($_[0]) eq 'Test2::API::Context'; push @hooks => 'global_release' });
-
--my $ref3 = $hub->add_context_aquire(sub { die "Bad Arg" unless ref($_[0]) eq 'HASH'; push @hooks => 'hub_aquire' });
--test2_add_callback_context_aquire(sub { die "Bad Arg" unless ref($_[0]) eq 'HASH'; push @hooks => 'global_aquire' });
-+my $ref3 = $hub->add_context_acquire(sub { die "Bad Arg" unless ref($_[0]) eq 'HASH'; push @hooks => 'hub_acquire' });
-+test2_add_callback_context_acquire(sub { die "Bad Arg" unless ref($_[0]) eq 'HASH'; push @hooks => 'global_acquire' });
-
- sub {
- push @hooks => 'start';
-@@ -185,23 +185,23 @@ sub {
-
- $hub->remove_context_init($ref1);
- $hub->remove_context_release($ref2);
--$hub->remove_context_aquire($ref3);
-+$hub->remove_context_acquire($ref3);
- @{Test2::API::_context_init_callbacks_ref()} = ();
- @{Test2::API::_context_release_callbacks_ref()} = ();
--@{Test2::API::_context_aquire_callbacks_ref()} = ();
-+@{Test2::API::_context_acquire_callbacks_ref()} = ();
-
- is_deeply(
- \@hooks,
- [qw{
- start
-- global_aquire
-- hub_aquire
-+ global_acquire
-+ hub_acquire
- global_init
- hub_init
- ctx_init
- deep
-- global_aquire
-- hub_aquire
-+ global_acquire
-+ hub_acquire
- release_deep
- release_parent
- ctx_release_deep
-@@ -210,8 +210,8 @@ is_deeply(
- global_release
- released_all
- new
-- global_aquire
-- hub_aquire
-+ global_acquire
-+ hub_acquire
- global_init
- hub_init
- ctx_init2
---- a/t/modules/API/Instance.t
-+++ b/t/modules/API/Instance.t
-@@ -29,7 +29,7 @@ is_deeply(
-
- exit_callbacks => [],
- post_load_callbacks => [],
-- context_aquire_callbacks => [],
-+ context_acquire_callbacks => [],
- context_init_callbacks => [],
- context_release_callbacks => [],
-
-@@ -63,7 +63,7 @@ is_deeply(
-
- exit_callbacks => [],
- post_load_callbacks => [],
-- context_aquire_callbacks => [],
-+ context_acquire_callbacks => [],
- context_init_callbacks => [],
- context_release_callbacks => [],
-
---- a/lib/Test2/Formatter/TAP.pm
-+++ b/lib/Test2/Formatter/TAP.pm
-@@ -369,7 +369,7 @@ order to do this you use the C<register_
-
- =head2 EVENT METHODS
-
--All these methods require the event itself. Optinally they can all except a
-+All these methods require the event itself. Optionally they can all except a
- test number.
-
- All methods return a list of array-refs. Each array-ref will have 2 items, the
---- a/lib/Test2/Transition.pod
-+++ b/lib/Test2/Transition.pod
-@@ -34,7 +34,7 @@ Some test modules would replace the Test
- own instance or subclass. This was usually done to intercept, or modify results
- as they happened.
-
--The Test::Builder singleton is now a simple compatability wrapper around
-+The Test::Builder singleton is now a simple compatibility wrapper around
- Test2. The Test::Builder singleton is no longer the central place for
- results. Most results bypass the Test::Builder singleton completely, which
- breaks and behavior intended when replacing the singleton.
-@@ -145,7 +145,7 @@ L<Test2::Suite>.
- Every single tool in the chain from this, to C<ok>, to anything C<ok> calls
- needs to increment the C<$Level> variable. When an error occurs Test::Builder
- will do a trace to the stack frame determined by C<$Level>, and report that
--file+line as the one where the error occured. If you or any other tool you use
-+file+line as the one where the error occurred. If you or any other tool you use
- forgets to set C<$Level> then errors will be reported to the wrong place.
-
- =head2 TEST2
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libtest2-perl.git
More information about the Pkg-perl-cvs-commits
mailing list