[DRE-commits] [ruby-redis] 03/03: remove upstream merged patch

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository ruby-redis.

commit 16325df520ba32cf9c1b5e99611e91e85d27ffa9
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Jul 31 11:32:58 2015 +0530

    remove upstream merged patch
---
 debian/changelog                               |  1 +
 debian/patches/series                          |  1 -
 debian/patches/test_internal_random_port.patch | 30 --------------------------
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f7517c0..19544c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ruby-redis (3.2.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Remove patch test_internal_random_port.patch (merged upstream).
 
  -- Pirate Praveen <praveen at debian.org>  Fri, 31 Jul 2015 11:24:52 +0530
 
diff --git a/debian/patches/series b/debian/patches/series
index c504f49..08c516e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 disable-encoding-check.patch
-test_internal_random_port.patch
diff --git a/debian/patches/test_internal_random_port.patch b/debian/patches/test_internal_random_port.patch
deleted file mode 100644
index 73daf96..0000000
--- a/debian/patches/test_internal_random_port.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: use random port for tests
-Author: Jonas Genannt
-Forwarded: yes
-Bug: https://github.com/redis/redis-rb/pull/455
-
-diff --git a/test/internals_test.rb b/test/internals_test.rb
-index 0c0f7bc..7e3d61d 100644
---- a/test/internals_test.rb
-+++ b/test/internals_test.rb
-@@ -375,8 +375,18 @@ class TestInternals < Test::Unit::TestCase
-       begin
-         s = Socket.new(af, Socket::SOCK_STREAM, 0)
-         begin
--          sa = Socket.pack_sockaddr_in(9999, hosts[af])
--          s.bind(sa)
-+          tries = 5
-+          begin
-+            sa = Socket.pack_sockaddr_in(Random.rand(1024..65000), hosts[af])
-+            s.bind(sa)
-+          rescue Errno::EADDRINUSE => e
-+            tries -= 1
-+            if tries > 0
-+              retry
-+            else
-+              raise Errno::EADDRINUSE, e
-+            end
-+          end
-           yield
-         rescue Errno::EADDRNOTAVAIL
-         ensure

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-redis.git