[DRE-commits] [ruby-raindrops] 01/03: Remove patch in patch (sic)

[Jérémy Bobbio]

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

lunar pushed a commit to branch master
in repository ruby-raindrops.

commit 132436ee04b22048b37603c1d955929fbc31da7b
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Mon Oct 7 14:17:29 2013 +0200

    Remove patch in patch (sic)
---
 ...ts-which-require-inet_diag-or-tcp_diag-ke.patch |   61 --------------------
 1 file changed, 61 deletions(-)

diff --git a/debian/patches/0004-Disable-tests-which-require-inet_diag-or-tcp_diag-ke.patch b/debian/patches/0004-Disable-tests-which-require-inet_diag-or-tcp_diag-ke.patch
index e16efff..319fd7b 100644
--- a/debian/patches/0004-Disable-tests-which-require-inet_diag-or-tcp_diag-ke.patch
+++ b/debian/patches/0004-Disable-tests-which-require-inet_diag-or-tcp_diag-ke.patch
@@ -5,68 +5,7 @@ Subject: Disable tests which require inet_diag or tcp_diag kernel modules
   These test will fail on buildd servers because they don't autoload
   kernel modules (at least inet_diag and tcp_diag required for these tests)
 ---
- ...t-which-require-inet_diag-or-tcp_diag-ker.patch | 41 ++++++++++++++++++++++
- debian/patches/series                              |  1 +
- test/test_linux.rb                                 |  6 ++--
- 3 files changed, 45 insertions(+), 3 deletions(-)
- create mode 100644 debian/patches/0004-Disable-test-which-require-inet_diag-or-tcp_diag-ker.patch
 
-diff --git a/debian/patches/0004-Disable-test-which-require-inet_diag-or-tcp_diag-ker.patch b/debian/patches/0004-Disable-test-which-require-inet_diag-or-tcp_diag-ker.patch
-new file mode 100644
-index 0000000..9897be9
---- /dev/null
-+++ b/debian/patches/0004-Disable-test-which-require-inet_diag-or-tcp_diag-ker.patch
-@@ -0,0 +1,41 @@
-+From: Hleb Valoshka <375GNU at Gmail.COM>
-+Date: Tue, 24 Sep 2013 21:55:01 +0300
-+Subject: Disable test which require inet_diag or tcp_diag kernel modules
-+
-+  These test will fail on buildd servers because they don't autoload
-+  kernel modules (at least inet_diag and tcp_diag required for these tests)
-+---
-+ test/test_linux.rb | 6 +++---
-+ 1 file changed, 3 insertions(+), 3 deletions(-)
-+
-+diff --git a/test/test_linux.rb b/test/test_linux.rb
-+index 0e79a86..ec71681 100644
-+--- a/test/test_linux.rb
-++++ b/test/test_linux.rb
-+@@ -106,7 +106,7 @@ class TestLinux < Test::Unit::TestCase
-+     assert_equal 1, stats[tmp.path].queued
-+   end
-+ 
-+-  def test_tcp
-++  def disable_test_tcp
-+     s = TCPServer.new(TEST_ADDR, 0)
-+     port = s.addr[1]
-+     addr = "#{TEST_ADDR}:#{port}"
-+@@ -129,7 +129,7 @@ class TestLinux < Test::Unit::TestCase
-+     assert_equal 1, stats[addr].active
-+   end
-+ 
-+-  def test_tcp_reuse_sock
-++  def disable_test_tcp_reuse_sock
-+     nlsock = Raindrops::InetDiagSocket.new
-+     s = TCPServer.new(TEST_ADDR, 0)
-+     port = s.addr[1]
-+@@ -155,7 +155,7 @@ class TestLinux < Test::Unit::TestCase
-+       nlsock.close
-+   end
-+ 
-+-  def test_tcp_multi
-++  def disable_test_tcp_multi
-+     s1 = TCPServer.new(TEST_ADDR, 0)
-+     s2 = TCPServer.new(TEST_ADDR, 0)
-+     port1, port2 = s1.addr[1], s2.addr[1]
-diff --git a/debian/patches/series b/debian/patches/series
-index 986a107..4b882ce 100644
---- a/debian/patches/series
-+++ b/debian/patches/series
-@@ -1,3 +1,4 @@
- 0001-Test-suite-fix-for-IPv6.patch
- 0002-Invoke-unix_listener_stats-conditionally.patch
- 0003-Remove-Scope-IDs-from-IPv6-addresses.patch
-+0004-Disable-test-which-require-inet_diag-or-tcp_diag-ker.patch
 diff --git a/test/test_linux.rb b/test/test_linux.rb
 index 0e79a86..ec71681 100644
 --- a/test/test_linux.rb

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