[DRE-commits] [ruby-kgio] 03/05: Drop patches they've found their way to upstream
Hleb Valoshka
tsfgnu-guest at alioth.debian.org
Sat Sep 14 11:08:50 UTC 2013
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 837d5cc7cdeadbef130ac188e3580720c777b969
Author: Hleb Valoshka <375GNU at Gmail.COM>
Date: Wed Sep 11 22:37:16 2013 +0300
Drop patches they've found their way to upstream
---
...0001-Disabled-test-failing-under-fakeroot.patch | 22 -------
...fix-of-temporary-sockets-to-prevent-races.patch | 63 --------------------
.../0003-Don-t-dump-20M-in-case-of-failure.patch | 32 ----------
debian/patches/series | 3 -
4 files changed, 120 deletions(-)
diff --git a/debian/patches/0001-Disabled-test-failing-under-fakeroot.patch b/debian/patches/0001-Disabled-test-failing-under-fakeroot.patch
deleted file mode 100644
index 387bd26..0000000
--- a/debian/patches/0001-Disabled-test-failing-under-fakeroot.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Hleb Valoshka <375GNU at Gmail.COM>
-Date: Sat, 17 Aug 2013 12:18:45 +0300
-Subject: Disabled test failing under fakeroot
-
-This test will fail under fakeroot, so disable it.
----
- test/test_tryopen.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/test_tryopen.rb b/test/test_tryopen.rb
-index 8a8278c..975549d 100644
---- a/test/test_tryopen.rb
-+++ b/test/test_tryopen.rb
-@@ -26,7 +26,7 @@ class TestTryopen < Test::Unit::TestCase
- assert_equal :ENOENT, tmp
- end
-
-- def test_tryopen_EACCES
-+ def disabled_test_tryopen_EACCES
- tmp = Tempfile.new "tryopen"
- File.chmod 0000, tmp.path
- tmp = Kgio::File.tryopen(tmp.path)
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
deleted file mode 100644
index f7b7b50..0000000
--- a/debian/patches/0002-Change-prefix-of-temporary-sockets-to-prevent-races.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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
deleted file mode 100644
index 60c0071..0000000
--- a/debian/patches/0003-Don-t-dump-20M-in-case-of-failure.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
deleted file mode 100644
index 0a3fdde..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-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
More information about the Pkg-ruby-extras-commits
mailing list