[DRE-commits] [ruby-kgio] 02/03: New patches

[Hleb Valoshka]

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

tsfgnu-guest pushed a commit to branch master
in repository ruby-kgio.

commit e2564e2ac7eb893ec81abe8cf0711c0aafbcf17f
Author: Hleb Valoshka <375GNU at Gmail.COM>
Date:   Sat Aug 24 16:55:26 2013 +0300

    New patches
---
 ...fix-of-temporary-sockets-to-prevent-races.patch |   63 ++++++++++++++++++++
 .../0003-Don-t-dump-20M-in-case-of-failure.patch   |   32 ++++++++++
 debian/patches/series                              |    2 +
 3 files changed, 97 insertions(+)

diff --git a/debian/patches/0002-Change-prefix-of-temporary-sockets-to-prevent-races.patch b/debian/patches/0002-Change-prefix-of-temporary-sockets-to-prevent-races.patch
new file mode 100644
index 0000000..f7b7b50
--- /dev/null
+++ b/debian/patches/0002-Change-prefix-of-temporary-sockets-to-prevent-races.patch
@@ -0,0 +1,63 @@
+From: Hleb Valoshka <375GNU at Gmail.COM>
+Date: Sat, 24 Aug 2013 16:50:17 +0300
+Subject: Change prefix of temporary sockets to prevent races
+
+---
+ test/test_unix_client_read_server_write.rb | 2 +-
+ test/test_unix_connect.rb                  | 2 +-
+ test/test_unix_server.rb                   | 2 +-
+ test/test_unix_server_read_client_write.rb | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/test/test_unix_client_read_server_write.rb b/test/test_unix_client_read_server_write.rb
+index 64b81bf..f5d481a 100644
+--- a/test/test_unix_client_read_server_write.rb
++++ b/test/test_unix_client_read_server_write.rb
+@@ -3,7 +3,7 @@ require 'tempfile'
+ 
+ class TestUnixClientReadServerWrite < Test::Unit::TestCase
+   def setup
+-    tmp = Tempfile.new('kgio_unix')
++    tmp = Tempfile.new('kgio_unix_0')
+     @path = tmp.path
+     File.unlink(@path)
+     tmp.close rescue nil
+diff --git a/test/test_unix_connect.rb b/test/test_unix_connect.rb
+index b85f1f6..007f422 100644
+--- a/test/test_unix_connect.rb
++++ b/test/test_unix_connect.rb
+@@ -14,7 +14,7 @@ end
+ class TestKgioUnixConnect < Test::Unit::TestCase
+ 
+   def setup
+-    tmp = Tempfile.new('kgio_unix')
++    tmp = Tempfile.new('kgio_unix_1')
+     @path = tmp.path
+     File.unlink(@path)
+     tmp.close rescue nil
+diff --git a/test/test_unix_server.rb b/test/test_unix_server.rb
+index faa8209..b15d9ec 100644
+--- a/test/test_unix_server.rb
++++ b/test/test_unix_server.rb
+@@ -4,7 +4,7 @@ require './test/lib_server_accept'
+ class TestKgioUNIXServer < Test::Unit::TestCase
+ 
+   def setup
+-    tmp = Tempfile.new('kgio_unix')
++    tmp = Tempfile.new('kgio_unix_2')
+     @path = tmp.path
+     File.unlink(@path)
+     tmp.close rescue nil
+diff --git a/test/test_unix_server_read_client_write.rb b/test/test_unix_server_read_client_write.rb
+index db304a2..0f57bfe 100644
+--- a/test/test_unix_server_read_client_write.rb
++++ b/test/test_unix_server_read_client_write.rb
+@@ -3,7 +3,7 @@ require 'tempfile'
+ 
+ class TestUnixServerReadClientWrite < Test::Unit::TestCase
+   def setup
+-    tmp = Tempfile.new('kgio_unix')
++    tmp = Tempfile.new('kgio_unix_3')
+     @path = tmp.path
+     File.unlink(@path)
+     tmp.close rescue nil
diff --git a/debian/patches/0003-Don-t-dump-20M-in-case-of-failure.patch b/debian/patches/0003-Don-t-dump-20M-in-case-of-failure.patch
new file mode 100644
index 0000000..60c0071
--- /dev/null
+++ b/debian/patches/0003-Don-t-dump-20M-in-case-of-failure.patch
@@ -0,0 +1,32 @@
+From: Hleb Valoshka <375GNU at Gmail.COM>
+Date: Sat, 24 Aug 2013 17:31:42 +0300
+Subject: Don't dump 20M in case of failure
+
+---
+ test/lib_read_write.rb | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/test/lib_read_write.rb b/test/lib_read_write.rb
+index 586e826..7df9a79 100644
+--- a/test/lib_read_write.rb
++++ b/test/lib_read_write.rb
+@@ -356,7 +356,8 @@ module LibReadWriteTest
+     readed = @rd.read(RANDOM_BLOB.size)
+     thr.join
+     assert_nil thr.value
+-    assert_equal RANDOM_BLOB, readed
++    e = (RANDOM_BLOB == readed)
++    assert e
+   end
+ 
+   def test_monster_write_wait_writable
+@@ -388,7 +389,8 @@ module LibReadWriteTest
+     readed = @rd.read(buf_size)
+     thr.join
+     assert_nil thr.value
+-    assert_equal buf.join, readed
++    e = (buf.join == readed)
++    assert e
+     assert @wr.instance_variable_get(:@nr) > 0
+   end
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 391368a..0a3fdde 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 0001-Disabled-test-failing-under-fakeroot.patch
+0002-Change-prefix-of-temporary-sockets-to-prevent-races.patch
+0003-Don-t-dump-20M-in-case-of-failure.patch

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