[DRE-commits] [ruby-hiredis] 04/07: Refresh patches

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch master
in repository ruby-hiredis.

commit af4c4c98e99b55643da4d8d437c35b683295b977
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Fri Oct 23 14:51:53 2015 +0300

    Refresh patches
---
 debian/patches/disable-network-tests.patch  | 77 ++++++++++++++++++++---------
 debian/patches/disable-no-eagain-test.patch |  2 +-
 2 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/debian/patches/disable-network-tests.patch b/debian/patches/disable-network-tests.patch
index 5830b6b..37070d5 100644
--- a/debian/patches/disable-network-tests.patch
+++ b/debian/patches/disable-network-tests.patch
@@ -9,12 +9,45 @@ Forwarded: no
 Last-Update: 2014-04-14
 --- a/test/connection_test.rb
 +++ b/test/connection_test.rb
-@@ -104,27 +104,30 @@
+@@ -151,41 +151,44 @@
      end
    end
  
 -  def test_connect_tcp_with_timeout
 -    hiredis.timeout = 200_000
+-
+-    t = Time.now
+-    assert_raises Errno::ETIMEDOUT do
+-      hiredis.connect("1.1.1.1", 59876)
+-    end
+-
+-    assert 210_000 > (Time.now - t)
+-  end
+-
+-  def test_connect_tcp_with_timeout_override
+-    hiredis.timeout = 1_000_000
+-
+-    t = Time.now
+-    assert_raises Errno::ETIMEDOUT do
+-      hiredis.connect("1.1.1.1", 59876, 200_000)
+-    end
+-
+-    assert 210_000 > (Time.now - t)
+-  end
+-
+-  def test_connect_tcp_without_timeout
+-    hiredis.timeout = 0
+-
+-    finished = false
+-    thread = Thread.new do
+-      hiredis.connect("1.1.1.1", 59876)
+-      finished = true
+-    end
+-
+-    sleep(0.5) # double of default timeout
+-    assert !finished
+-    thread.kill
+-  end
 +  ## The following tests do not work reliably with all possible environments.
 +  # Connecting to 1.1.1.1 may - among other things - succeed or yield a
 +  # connection refused or host unreachable error.
@@ -22,7 +55,7 @@ Last-Update: 2014-04-14
 +  #  hiredis.timeout = 200_000
 +
 +  #  t = Time.now
-+  #  assert_raise Errno::ETIMEDOUT do
++  #  assert_raises Errno::ETIMEDOUT do
 +  #    hiredis.connect("1.1.1.1", 59876)
 +  #  end
 +
@@ -33,30 +66,26 @@ Last-Update: 2014-04-14
 +  #  hiredis.timeout = 1_000_000
 +
 +  #  t = Time.now
-+  #  assert_raise Errno::ETIMEDOUT do
++  #  assert_raises Errno::ETIMEDOUT do
 +  #    hiredis.connect("1.1.1.1", 59876, 200_000)
 +  #  end
- 
--    t = Time.now
--    assert_raise Errno::ETIMEDOUT do
--      hiredis.connect("1.1.1.1", 59876)
--    end
--
--    assert 210_000 > (Time.now - t)
--  end
--
--  def test_connect_tcp_with_timeout_override
--    hiredis.timeout = 1_000_000
--
--    t = Time.now
--    assert_raise Errno::ETIMEDOUT do
--      hiredis.connect("1.1.1.1", 59876, 200_000)
--    end
--
--    assert 210_000 > (Time.now - t)
--  end
++
 +  #  assert 210_000 > (Time.now - t)
 +  #end
++
++  #def test_connect_tcp_without_timeout
++  #  hiredis.timeout = 0
++
++  #  finished = false
++  #  thread = Thread.new do
++  #    hiredis.connect("1.1.1.1", 59876)
++  #    finished = true
++  #  end
++
++  #  sleep(0.5) # double of default timeout
++  #  assert !finished
++  #  thread.kill
++  #end
  
-   def test_connect_tcp_without_timeout
-     hiredis.timeout = 0
+   def test_read_when_disconnected
+     assert_raises RuntimeError, "not connected" do
diff --git a/debian/patches/disable-no-eagain-test.patch b/debian/patches/disable-no-eagain-test.patch
index 173a6a5..da576f0 100644
--- a/debian/patches/disable-no-eagain-test.patch
+++ b/debian/patches/disable-no-eagain-test.patch
@@ -8,7 +8,7 @@ Last-Update: 2014-04-14
 
 --- a/test/connection_test.rb
 +++ b/test/connection_test.rb
-@@ -315,35 +315,37 @@
+@@ -362,35 +362,37 @@
      end
    end
  

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