r19599 - in /branches/upstream/libtest-http-server-simple-perl/current: Changes META.yml SIGNATURE lib/Test/HTTP/Server/Simple.pm
yvesago-guest at users.alioth.debian.org
yvesago-guest at users.alioth.debian.org
Wed May 7 07:47:41 UTC 2008
Author: yvesago-guest
Date: Wed May 7 07:47:40 2008
New Revision: 19599
URL: http://svn.debian.org/wsvn/?sc=1&rev=19599
Log:
[svn-upgrade] Integrating new upstream version, libtest-http-server-simple-perl (0.09)
Modified:
branches/upstream/libtest-http-server-simple-perl/current/Changes
branches/upstream/libtest-http-server-simple-perl/current/META.yml
branches/upstream/libtest-http-server-simple-perl/current/SIGNATURE
branches/upstream/libtest-http-server-simple-perl/current/lib/Test/HTTP/Server/Simple.pm
Modified: branches/upstream/libtest-http-server-simple-perl/current/Changes
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-http-server-simple-perl/current/Changes?rev=19599&op=diff
==============================================================================
--- branches/upstream/libtest-http-server-simple-perl/current/Changes (original)
+++ branches/upstream/libtest-http-server-simple-perl/current/Changes Wed May 7 07:47:40 2008
@@ -1,4 +1,12 @@
Revision history for Test-HTTP-Server-Simple
+
+0.08 Tue May 6 14:14:13 EDT 2008
+ Releng fixups
+
+
+0.07 Tue May 6 14:00:50 EST 2008
+ Be more insistent about sending signals on END
+ Also don't assume all children processes are ours
0.06 Tue Nov 13 16:38:40 EST 2007
META.yml SHA1 SUM issue
Modified: branches/upstream/libtest-http-server-simple-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-http-server-simple-perl/current/META.yml?rev=19599&op=diff
==============================================================================
--- branches/upstream/libtest-http-server-simple-perl/current/META.yml (original)
+++ branches/upstream/libtest-http-server-simple-perl/current/META.yml Wed May 7 07:47:40 2008
@@ -1,18 +1,15 @@
---- #YAML:1.0
-name: Test-HTTP-Server-Simple
-version: 0.06
-abstract: Test::More functions for HTTP::Server::Simple
-license: ~
-generated_by: ExtUtils::MakeMaker version 6.36
-distribution_type: module
-requires:
+# http://module-build.sourceforge.net/META-spec.html
+#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
+name: Test-HTTP-Server-Simple
+version: 0.09
+version_from: lib/Test/HTTP/Server/Simple.pm
+installdirs: site
+requires:
HTTP::Server::Simple: 0
NEXT: 0
Test::Builder: 0
Test::Builder::Tester: 1.04
Test::More: 0
-meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.2.html
- version: 1.2
-author:
- - David Glasser <glasser at bestpractical.com>
+
+distribution_type: module
+generated_by: ExtUtils::MakeMaker version 6.30
Modified: branches/upstream/libtest-http-server-simple-perl/current/SIGNATURE
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-http-server-simple-perl/current/SIGNATURE?rev=19599&op=diff
==============================================================================
--- branches/upstream/libtest-http-server-simple-perl/current/SIGNATURE (original)
+++ branches/upstream/libtest-http-server-simple-perl/current/SIGNATURE Wed May 7 07:47:40 2008
@@ -14,20 +14,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-SHA1 1340ccd0b5dd311c1a93b4c508ed7f43ae0392ab Changes
+SHA1 7298a41d0e8b2781b244264034d5a2af8c5e0d40 Changes
SHA1 fde2e498ced242649142d34769cdb32ec5ba17dd MANIFEST
-SHA1 17bd72441eedc4d39a838e0e8ca7c49582ad0081 META.yml
+SHA1 c55b48910a38d99d8a4ec851cce204689e2a6e18 META.yml
SHA1 bc05af0bffcf1216bc552bd0e62608902e7b15bf Makefile.PL
SHA1 fa0e7c54e60cea400aab16e8f4b3044958a87790 README
-SHA1 eaf47e05bc02ecee3a220447f25e4b7aaa4800f3 lib/Test/HTTP/Server/Simple.pm
+SHA1 0c03682828a7cf8dab829f68173e74ab0e1aa2db lib/Test/HTTP/Server/Simple.pm
SHA1 6c3fc19c093bda0b4e8077ebb7ceec2f8944b7d2 t/00.load.t
SHA1 1bdea5dc9c47d345d49089a684f2c59190ad4747 t/01.basic.t
SHA1 6da39b48ce64b584e4c3274bff96fc76ff484820 t/pod-coverage.t
SHA1 0190346d7072d458c8a10a45c19f86db641dcc48 t/pod.t
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.8 (Darwin)
-iD8DBQFHOhqTEi9d9xCOQEYRAiRwAJwOQIGR+mKaE25e2bSI23OXnuWTDQCgt46v
-RZcA4XwGCDnbex/mhlXt7kI=
-=hVSs
+iD8DBQFIINYSEi9d9xCOQEYRAm30AKCNGs4WpQ72ROex7av8iBZIx9anTgCfaHcS
+X09kzGBNX/iK0szu4dbDCTA=
+=vWs5
-----END PGP SIGNATURE-----
Modified: branches/upstream/libtest-http-server-simple-perl/current/lib/Test/HTTP/Server/Simple.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libtest-http-server-simple-perl/current/lib/Test/HTTP/Server/Simple.pm?rev=19599&op=diff
==============================================================================
--- branches/upstream/libtest-http-server-simple-perl/current/lib/Test/HTTP/Server/Simple.pm (original)
+++ branches/upstream/libtest-http-server-simple-perl/current/lib/Test/HTTP/Server/Simple.pm Wed May 7 07:47:40 2008
@@ -1,6 +1,6 @@
package Test::HTTP::Server::Simple;
-our $VERSION = '0.06';
+our $VERSION = '0.09';
use warnings;
use strict;
@@ -45,9 +45,7 @@
This mixin class provides methods to test an L<HTTP::Server::Simple>-based web
server. Currently, it provides only one such method: C<started_ok>.
-=over 4
-
-=item started_ok [$text]
+=head2 started_ok [$text]
C<started_ok> takes
an optional test description. The server needs to have been configured (specifically,
@@ -72,6 +70,7 @@
$SIG{INT} = sub { warn "INT:$$"; exit };
END {
+ local $?;
if (WIN32) {
# INT won't do since the server is doing a blocking read
# which isn't interrupted by anything but KILL on win32.
@@ -82,8 +81,19 @@
}
}
else {
- kill 'USR1', @CHILD_PIDS if @CHILD_PIDS;
- wait for @CHILD_PIDS;
+ @CHILD_PIDS = grep {kill 0, $_} @CHILD_PIDS;
+ while (@CHILD_PIDS) {
+ kill 'USR1', @CHILD_PIDS;
+ local $SIG{ALRM} = sub {die};
+ alarm(5);
+ eval {
+ my $pid;
+ @CHILD_PIDS = grep {$_ != $pid} @CHILD_PIDS
+ while $pid = wait and $pid > 0 and @CHILD_PIDS;
+ @CHILD_PIDS = () if $pid == -1;
+ };
+ alarm(0);
+ }
}
}
@@ -170,9 +180,19 @@
else {
kill 'USR1', $self->{'test_http_server_simple_parent_pid'};
}
-}
-
-=back
+}
+
+=head2 pids
+
+Returns the PIDs of the processes which have been started. Since
+multiple test servers can be running at one, be aware that this
+returns a list.
+
+=cut
+
+sub pids {
+ return @CHILD_PIDS;
+}
=head1 DEPENDENCIES
More information about the Pkg-perl-cvs-commits
mailing list