[DRE-commits] [SCM] ruby-raindrops.git branch, master, updated. upstream/0.8.0-10-ge6dd41f

[Dmitry Borodaenko]

The following commit has been merged in the master branch:
commit e6dd41ff49968a8f4dc2bb60a5d21db64c9f3c8e
Author: Dmitry Borodaenko <angdraug at debian.org>
Date:   Thu Mar 15 21:48:55 2012 +0300

    skip unix_listener_stats instead of masking rack.logger error
    
    The rack.logger fix only masks the problem, unix_listener_stats has a
    better chance of fixing it for good.
    
    Patches re-generated with gbp-pq.

diff --git a/debian/changelog b/debian/changelog
index d2d66d2..2771b30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
 ruby-raindrops (0.8.0-2) unstable; urgency=low
 
+  [ Hleb Valoshka ]
   * Backport upstream commit 499e63e2 to fix tests under non-Linux
-  * Patch for absent on buildd env['rack.logger'] (Closes: #661401)
   * Update Standards-Version to 3.9.3
 
- -- Hleb Valoshka <375gnu at gmail.com>  Sat, 15 Mar 2012 21:02:48 +0300
+  [ Dmitry Borodaenko ]
+  * Invoke unix_listener_stats conditionally (Closes: #661401)
+
+ -- Hleb Valoshka <375gnu at gmail.com>  Thu, 15 Mar 2012 21:47:29 +0300
 
 ruby-raindrops (0.8.0-1) unstable; urgency=low
 
diff --git a/debian/patches/0001-Test-suite-fix-for-IPv6.patch b/debian/patches/0001-Test-suite-fix-for-IPv6.patch
new file mode 100644
index 0000000..8105540
--- /dev/null
+++ b/debian/patches/0001-Test-suite-fix-for-IPv6.patch
@@ -0,0 +1,27 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Thu, 15 Mar 2012 21:36:21 +0300
+Subject: Test suite fix for IPv6
+
+---
+ test/test_linux_ipv6.rb |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/test/test_linux_ipv6.rb b/test/test_linux_ipv6.rb
+index ec08f28..9e8730a 100644
+--- a/test/test_linux_ipv6.rb
++++ b/test/test_linux_ipv6.rb
+@@ -12,6 +12,14 @@ class TestLinuxIPv6 < Test::Unit::TestCase
+ 
+   TEST_ADDR = ENV["TEST_HOST6"] || "::1"
+ 
++  def setup
++    @to_close = []
++  end
++
++  def teardown
++    @to_close.each { |io| io.close unless io.closed? }
++  end
++
+   def test_tcp
+     s = TCPServer.new(TEST_ADDR, 0)
+     port = s.addr[1]
diff --git a/debian/patches/fix-test-for-non-linux b/debian/patches/0002-Test-suite-fix-for-non-linux-users.patch
similarity index 85%
copy from debian/patches/fix-test-for-non-linux
copy to debian/patches/0002-Test-suite-fix-for-non-linux-users.patch
index 8750be9..3beb4e4 100644
--- a/debian/patches/fix-test-for-non-linux
+++ b/debian/patches/0002-Test-suite-fix-for-non-linux-users.patch
@@ -1,4 +1,3 @@
-From 499e63e2666f88134f7d47f3bcfdfedd72396e70 Mon Sep 17 00:00:00 2001
 From: Jeremy Evans <code at jeremyevans.net>
 Date: Mon, 14 Nov 2011 18:31:53 +0000
 Subject: Test suite fix for non-linux users
@@ -8,6 +7,9 @@ test_linux_tcp_info.rb does not.
 
 With this patch, gmake test passes on OpenBSD.
 ---
+ test/test_linux_tcp_info.rb |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
 diff --git a/test/test_linux_tcp_info.rb b/test/test_linux_tcp_info.rb
 index f429d1d..3b4a245 100644
 --- a/test/test_linux_tcp_info.rb
@@ -18,5 +20,3 @@ index f429d1d..3b4a245 100644
    end
 -end
 +end if RUBY_PLATFORM =~ /linux/
---
-cgit v0.9.0.2-54-g2d9a
diff --git a/debian/patches/0003-Invoke-unix_listener_stats-conditionally.patch b/debian/patches/0003-Invoke-unix_listener_stats-conditionally.patch
new file mode 100644
index 0000000..4085edd
--- /dev/null
+++ b/debian/patches/0003-Invoke-unix_listener_stats-conditionally.patch
@@ -0,0 +1,24 @@
+From: Dmitry Borodaenko <angdraug at debian.org>
+Date: Thu, 15 Mar 2012 21:40:35 +0300
+Subject: Invoke unix_listener_stats conditionally
+
+unix_listener_stats reads /proc/net/unix on every invokation, that is
+not only expensive, but also breaks the test suite when build process
+isn't allowed to access /proc.
+---
+ lib/raindrops/watcher.rb |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/raindrops/watcher.rb b/lib/raindrops/watcher.rb
+index 869fa17..e680a44 100644
+--- a/lib/raindrops/watcher.rb
++++ b/lib/raindrops/watcher.rb
+@@ -167,7 +167,7 @@ class Raindrops::Watcher
+     thr = Thread.new do
+       begin
+         combined = tcp_listener_stats(@tcp_listeners, sock)
+-        combined.merge!(unix_listener_stats(@unix_listeners))
++        combined.merge!(unix_listener_stats(@unix_listeners)) if @unix_listeners
+         @lock.synchronize do
+           now = Time.now.utc
+           combined.each do |addr,stats|
diff --git a/debian/patches/series b/debian/patches/series
index 3c49d6e..3082857 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-fix-absent-on-buildd-rack-logger
-fix-test-for-ipv6
-fix-test-for-non-linux
+0001-Test-suite-fix-for-IPv6.patch
+0002-Test-suite-fix-for-non-linux-users.patch
+0003-Invoke-unix_listener_stats-conditionally.patch

-- 
ruby-raindrops.git