[libgearman-client-perl] 04/15: Drop test-random-ports.patch (upstream changes)
Nick Morrott
nickm-guest at moszumanska.debian.org
Sun Aug 7 02:04:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
nickm-guest pushed a commit to branch master
in repository libgearman-client-perl.
commit c4ec5c288fa009213341e8b39a6eb90222bdad4e
Author: Nick Morrott <knowledgejunkie at gmail.com>
Date: Fri Aug 5 21:58:00 2016 +0100
Drop test-random-ports.patch (upstream changes)
---
debian/patches/series | 2 --
debian/patches/test-random-ports.patch | 64 ----------------------------------
2 files changed, 66 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
index 41d8283..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-fix-server-connection-error.patch
-test-random-ports.patch
diff --git a/debian/patches/test-random-ports.patch b/debian/patches/test-random-ports.patch
deleted file mode 100644
index ece216a..0000000
--- a/debian/patches/test-random-ports.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Description: use random ports when starting test gearman server
- The default port of 9050 may be already taken, e.g. by tor, leading to test
- hangs.
-Bug: https://rt.cpan.org/Ticket/Display.html?id=91973
-Bug-Debian: https://bugs.debian.org/723940
-Forwarded: https://rt.cpan.org/Ticket/Display.html?id=91973
-Author: Damyan Ivanov <dmn at debian.org>
-Reviewed-by: gregor herrmann <gregoa at debian.org>
-Last-Update: 2015-12-05
-
---- a/t/TestGearman.pm
-+++ b/t/TestGearman.pm
-@@ -10,8 +10,40 @@
- our $Bin;
- use FindBin qw( $Bin );
-
--# TODO: use a variation of t/lib/GearTestLib::free_port to find 3 free ports
--use constant PORT => 9050;
-+our $_PORT;
-+# find a sequence of three free ports and return the first
-+sub PORT() {
-+ #use Carp;
-+ if ($_PORT) {
-+ #Carp::cluck "# returning cached port $_PORT";
-+ return $_PORT;
-+ }
-+
-+ my $port = shift;
-+ my $type = shift || "tcp";
-+ my $sock;
-+ SEQ:
-+ while (1) {
-+ for my $offset ( 0..2 ) {
-+ $sock = IO::Socket::INET->new(
-+ LocalAddr => '127.0.0.1',
-+ LocalPort => $port + $offset,
-+ Proto => $type,
-+ ReuseAddr => 1
-+ );
-+
-+ unless ($sock) {
-+ $port = int(rand(20000)) + 30000;
-+ next SEQ;
-+ }
-+
-+ undef($sock);
-+ }
-+
-+ #Carp::cluck "# PORT = $port";
-+ return $_PORT = $port;
-+ }
-+}
-
- our $NUM_SERVERS = 1;
-
-@@ -35,6 +67,8 @@
- $ready = 1;
- };
-
-+ #use Carp;
-+ #Carp::cluck "# Starting test server on port $port";
- my $pid = start_child([ $server, '-p' => $port, '-n' => $$ ]);
- $Children{$pid} = 'S';
- while (!$ready) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libgearman-client-perl.git
More information about the Pkg-perl-cvs-commits
mailing list