r61658 - in /trunk/libtest-tcp-perl: ./ debian/ inc/ inc/Module/Install/ inc/Test/ inc/Test/Base/ inc/Test/Builder/ lib/Test/ t/
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Mon Aug 16 17:16:37 UTC 2010
Author: gregoa
Date: Mon Aug 16 17:15:49 2010
New Revision: 61658
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=61658
Log:
* New upstream release 1.00
* New upstream release 1.01.
Removed:
trunk/libtest-tcp-perl/inc/Module/Install/TestBase.pm
trunk/libtest-tcp-perl/inc/Spiffy.pm
trunk/libtest-tcp-perl/inc/Test/Base/
trunk/libtest-tcp-perl/inc/Test/Base.pm
trunk/libtest-tcp-perl/inc/Test/Builder/
trunk/libtest-tcp-perl/inc/Test/Builder.pm
trunk/libtest-tcp-perl/inc/YAML.pm
Modified:
trunk/libtest-tcp-perl/Changes
trunk/libtest-tcp-perl/MANIFEST
trunk/libtest-tcp-perl/META.yml
trunk/libtest-tcp-perl/Makefile.PL
trunk/libtest-tcp-perl/debian/changelog
trunk/libtest-tcp-perl/inc/Test/More.pm
trunk/libtest-tcp-perl/lib/Test/TCP.pm
trunk/libtest-tcp-perl/t/02_abrt.t
trunk/libtest-tcp-perl/t/03_return_when_sigterm.t
trunk/libtest-tcp-perl/t/04_die.t
trunk/libtest-tcp-perl/t/05_sigint.t
trunk/libtest-tcp-perl/t/06_nest.t
Modified: trunk/libtest-tcp-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tcp-perl/Changes?rev=61658&op=diff
==============================================================================
--- trunk/libtest-tcp-perl/Changes (original)
+++ trunk/libtest-tcp-perl/Changes Mon Aug 16 17:15:49 2010
@@ -1,4 +1,8 @@
Revision history for Perl extension Test::TCP
+
+1.01
+
+ - remove unused deps for use_test_base().
1.00
Modified: trunk/libtest-tcp-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tcp-perl/MANIFEST?rev=61658&op=diff
==============================================================================
--- trunk/libtest-tcp-perl/MANIFEST (original)
+++ trunk/libtest-tcp-perl/MANIFEST Mon Aug 16 17:15:49 2010
@@ -8,16 +8,9 @@
inc/Module/Install/Include.pm
inc/Module/Install/Makefile.pm
inc/Module/Install/Metadata.pm
-inc/Module/Install/TestBase.pm
inc/Module/Install/Win32.pm
inc/Module/Install/WriteAll.pm
-inc/Spiffy.pm
-inc/Test/Base.pm
-inc/Test/Base/Filter.pm
-inc/Test/Builder.pm
-inc/Test/Builder/Module.pm
inc/Test/More.pm
-inc/YAML.pm
lib/Test/TCP.pm
Makefile.PL
MANIFEST This list of files
Modified: trunk/libtest-tcp-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tcp-perl/META.yml?rev=61658&op=diff
==============================================================================
--- trunk/libtest-tcp-perl/META.yml (original)
+++ trunk/libtest-tcp-perl/META.yml Mon Aug 16 17:15:49 2010
@@ -19,10 +19,9 @@
- t
- xt
requires:
- Filter::Util::Call: 0
IO::Socket::INET: 0
Test::SharedFork: 0.09
perl: 5.8.0
resources:
license: http://dev.perl.org/licenses/
-version: 1.00
+version: 1.01
Modified: trunk/libtest-tcp-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tcp-perl/Makefile.PL?rev=61658&op=diff
==============================================================================
--- trunk/libtest-tcp-perl/Makefile.PL (original)
+++ trunk/libtest-tcp-perl/Makefile.PL Mon Aug 16 17:15:49 2010
@@ -9,9 +9,7 @@
tests 't/*.t t/*/*.t t/*/*/*.t t/*/*/*/*.t';
test_requires 'Test::More';
-test_requires 'YAML';
author_tests 'xt';
-use_test_base;
auto_include;
WriteAll;
Modified: trunk/libtest-tcp-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tcp-perl/debian/changelog?rev=61658&op=diff
==============================================================================
--- trunk/libtest-tcp-perl/debian/changelog (original)
+++ trunk/libtest-tcp-perl/debian/changelog Mon Aug 16 17:15:49 2010
@@ -1,11 +1,15 @@
-libtest-tcp-perl (1.00-1) unstable; urgency=low
+libtest-tcp-perl (1.01-1) UNRELEASED; urgency=low
- * New upstream release
+ [ Nicholas Bamber ]
+ * New upstream release 1.00
* Upped standards to 3.9.1 and added myself to Uploaders
* Added myself to copyright
* Created debian/source/format
- -- Nicholas Bamber <nicholas at periapt.co.uk> Sun, 15 Aug 2010 08:51:26 +0100
+ [ gregor herrmann ]
+ * New upstream release 1.01.
+
+ -- gregor herrmann <gregoa at debian.org> Mon, 16 Aug 2010 19:13:23 +0200
libtest-tcp-perl (0.16-1) unstable; urgency=low
Modified: trunk/libtest-tcp-perl/inc/Test/More.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tcp-perl/inc/Test/More.pm?rev=61658&op=diff
==============================================================================
--- trunk/libtest-tcp-perl/inc/Test/More.pm (original)
+++ trunk/libtest-tcp-perl/inc/Test/More.pm Mon Aug 16 17:15:49 2010
@@ -18,7 +18,7 @@
return warn @_, " at $file line $line\n";
}
-our $VERSION = '0.94';
+our $VERSION = '0.96';
$VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval)
use Test::Builder::Module;
@@ -247,7 +247,7 @@
return $obj;
}
-#line 719
+#line 736
sub subtest($&) {
my ($name, $subtests) = @_;
@@ -256,7 +256,7 @@
return $tb->subtest(@_);
}
-#line 743
+#line 760
sub pass (;$) {
my $tb = Test::More->builder;
@@ -270,7 +270,7 @@
return $tb->ok( 0, @_ );
}
-#line 806
+#line 823
sub use_ok ($;@) {
my( $module, @imports ) = @_;
@@ -332,7 +332,7 @@
return( $eval_result, $eval_error );
}
-#line 875
+#line 892
sub require_ok ($) {
my($module) = shift;
@@ -340,7 +340,7 @@
my $pack = caller;
- # Try to deterine if we've been given a module name or file.
+ # Try to determine if we've been given a module name or file.
# Module names must be barewords, files not.
$module = qq['$module'] unless _is_module_name($module);
@@ -376,7 +376,7 @@
return $module =~ /^[a-zA-Z]\w*$/ ? 1 : 0;
}
-#line 952
+#line 969
our( @Data_Stack, %Refs_Seen );
my $DNE = bless [], 'Does::Not::Exist';
@@ -476,14 +476,14 @@
return '' if !ref $thing;
- for my $type (qw(ARRAY HASH REF SCALAR GLOB CODE Regexp)) {
+ for my $type (qw(Regexp ARRAY HASH REF SCALAR GLOB CODE)) {
return $type if UNIVERSAL::isa( $thing, $type );
}
return '';
}
-#line 1112
+#line 1129
sub diag {
return Test::More->builder->diag(@_);
@@ -493,13 +493,13 @@
return Test::More->builder->note(@_);
}
-#line 1138
+#line 1155
sub explain {
return Test::More->builder->explain(@_);
}
-#line 1204
+#line 1221
## no critic (Subroutines::RequireFinalReturn)
sub skip {
@@ -527,7 +527,7 @@
last SKIP;
}
-#line 1288
+#line 1305
sub todo_skip {
my( $why, $how_many ) = @_;
@@ -548,7 +548,7 @@
last TODO;
}
-#line 1343
+#line 1360
sub BAIL_OUT {
my $reason = shift;
@@ -557,7 +557,7 @@
$tb->BAIL_OUT($reason);
}
-#line 1382
+#line 1399
#'#
sub eq_array {
@@ -581,6 +581,8 @@
my $e1 = $_ > $#$a1 ? $DNE : $a1->[$_];
my $e2 = $_ > $#$a2 ? $DNE : $a2->[$_];
+ next if _equal_nonrefs($e1, $e2);
+
push @Data_Stack, { type => 'ARRAY', idx => $_, vals => [ $e1, $e2 ] };
$ok = _deep_check( $e1, $e2 );
pop @Data_Stack if $ok;
@@ -589,6 +591,21 @@
}
return $ok;
+}
+
+sub _equal_nonrefs {
+ my( $e1, $e2 ) = @_;
+
+ return if ref $e1 or ref $e2;
+
+ if ( defined $e1 ) {
+ return 1 if defined $e2 and $e1 eq $e2;
+ }
+ else {
+ return 1 if !defined $e2;
+ }
+
+ return;
}
sub _deep_check {
@@ -603,9 +620,6 @@
local %Refs_Seen = %Refs_Seen;
{
- # Quiet uninitialized value warnings when comparing undefs.
- no warnings 'uninitialized';
-
$tb->_unoverload_str( \$e1, \$e2 );
# Either they're both references or both not.
@@ -616,7 +630,7 @@
$ok = 0;
}
elsif( !defined $e1 and !defined $e2 ) {
- # Shortcut if they're both defined.
+ # Shortcut if they're both undefined.
$ok = 1;
}
elsif( _dne($e1) xor _dne($e2) ) {
@@ -683,7 +697,7 @@
}
}
-#line 1515
+#line 1546
sub eq_hash {
local @Data_Stack = ();
@@ -706,6 +720,8 @@
my $e1 = exists $a1->{$k} ? $a1->{$k} : $DNE;
my $e2 = exists $a2->{$k} ? $a2->{$k} : $DNE;
+ next if _equal_nonrefs($e1, $e2);
+
push @Data_Stack, { type => 'HASH', idx => $k, vals => [ $e1, $e2 ] };
$ok = _deep_check( $e1, $e2 );
pop @Data_Stack if $ok;
@@ -716,7 +732,7 @@
return $ok;
}
-#line 1572
+#line 1605
sub eq_set {
my( $a1, $a2 ) = @_;
@@ -741,6 +757,6 @@
);
}
-#line 1774
+#line 1807
1;
Modified: trunk/libtest-tcp-perl/lib/Test/TCP.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tcp-perl/lib/Test/TCP.pm?rev=61658&op=diff
==============================================================================
--- trunk/libtest-tcp-perl/lib/Test/TCP.pm (original)
+++ trunk/libtest-tcp-perl/lib/Test/TCP.pm Mon Aug 16 17:15:49 2010
@@ -2,7 +2,7 @@
use strict;
use warnings;
use 5.00800;
-our $VERSION = '1.00';
+our $VERSION = '1.01';
use base qw/Exporter/;
use IO::Socket::INET;
use Test::SharedFork;
Modified: trunk/libtest-tcp-perl/t/02_abrt.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tcp-perl/t/02_abrt.t?rev=61658&op=diff
==============================================================================
--- trunk/libtest-tcp-perl/t/02_abrt.t (original)
+++ trunk/libtest-tcp-perl/t/02_abrt.t Mon Aug 16 17:15:49 2010
@@ -1,7 +1,7 @@
use strict;
use warnings;
use Test::TCP;
-use Test::More;
+use Test::More tests => 2;
use Socket;
use IO::Socket::INET;
use t::Server;
@@ -21,7 +21,6 @@
is $res, "dump\n";
$sock->close();
ok 1;
- done_testing;
},
server => sub {
my $port = shift;
Modified: trunk/libtest-tcp-perl/t/03_return_when_sigterm.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tcp-perl/t/03_return_when_sigterm.t?rev=61658&op=diff
==============================================================================
--- trunk/libtest-tcp-perl/t/03_return_when_sigterm.t (original)
+++ trunk/libtest-tcp-perl/t/03_return_when_sigterm.t Mon Aug 16 17:15:49 2010
@@ -1,6 +1,6 @@
use warnings;
use strict;
-use Test::More;
+use Test::More tests => 1;
use Test::TCP;
use t::Server;
@@ -24,5 +24,4 @@
}
},
);
-done_testing;
Modified: trunk/libtest-tcp-perl/t/04_die.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tcp-perl/t/04_die.t?rev=61658&op=diff
==============================================================================
--- trunk/libtest-tcp-perl/t/04_die.t (original)
+++ trunk/libtest-tcp-perl/t/04_die.t Mon Aug 16 17:15:49 2010
@@ -1,6 +1,6 @@
use warnings;
use strict;
-use Test::More;
+use Test::More tests => 3;
use Test::TCP;
use IO::Socket::INET;
use t::Server;
@@ -24,5 +24,4 @@
like $@, qr/sinamon/;
my $killed = kill 9, $child_pid;
is $killed, 0, "already killed by test_tcp";
-done_testing;
Modified: trunk/libtest-tcp-perl/t/05_sigint.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tcp-perl/t/05_sigint.t?rev=61658&op=diff
==============================================================================
--- trunk/libtest-tcp-perl/t/05_sigint.t (original)
+++ trunk/libtest-tcp-perl/t/05_sigint.t Mon Aug 16 17:15:49 2010
@@ -7,6 +7,7 @@
use Config;
plan skip_all => "this test requires SIGUSR1" unless $Config{sig_name} =~ /USR1/;
+plan tests => 2;
my $pid = Test::SharedFork->fork;
# my $killed_server = 0;
@@ -18,7 +19,6 @@
ok POSIX::WIFSIGNALED($?);
is [split / /, $Config{sig_name}]->[POSIX::WTERMSIG($?)], 'INT', "sigint";
# ok $killed_server, "really killed";
- done_testing;
} elsif ($pid == 0) {
# $SIG{CHLD} = sub {
# kill 'USR1', POSIX::getppid();
Modified: trunk/libtest-tcp-perl/t/06_nest.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tcp-perl/t/06_nest.t?rev=61658&op=diff
==============================================================================
--- trunk/libtest-tcp-perl/t/06_nest.t (original)
+++ trunk/libtest-tcp-perl/t/06_nest.t Mon Aug 16 17:15:49 2010
@@ -1,7 +1,7 @@
use strict;
use warnings;
use Test::TCP;
-use Test::More;
+use Test::More tests => 1;
use t::Server;
test_tcp(
@@ -11,7 +11,6 @@
client => sub {
my $port2 = shift;
isnt $port1, $port2, "$port1, $port2";
- done_testing;
},
server => sub {
my $port2 = shift;
More information about the Pkg-perl-cvs-commits
mailing list