[DRE-commits] [test-kitchen] 25/39: Remove patch 0004-Fix-monkey-patching-of-IO.read.patch (applied by upstream)

[Hleb Valoshka]

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

tsfgnu-guest pushed a commit to branch master
in repository test-kitchen.

commit 156e8622c9d52e4a4950272cb13f9b0792d2d3fa
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Mon Aug 10 13:59:27 2015 +0300

    Remove patch 0004-Fix-monkey-patching-of-IO.read.patch (applied by upstream)
---
 .../0004-Fix-monkey-patching-of-IO.read.patch      | 36 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 37 deletions(-)

diff --git a/debian/patches/0004-Fix-monkey-patching-of-IO.read.patch b/debian/patches/0004-Fix-monkey-patching-of-IO.read.patch
deleted file mode 100644
index 774f1f2..0000000
--- a/debian/patches/0004-Fix-monkey-patching-of-IO.read.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Hleb Valoshka <375gnu at gmail.com>
-Date: Mon, 29 Jun 2015 20:39:07 +0300
-Subject: Fix monkey patching of IO.read
-
-Forwarded: https://github.com/test-kitchen/test-kitchen/pull/768
----
- spec/spec_helper.rb | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 707680f..fb61306 100644
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -24,7 +24,21 @@ require "tempfile"
- # Nasty hack to redefine IO.read in terms of File#read for fakefs
- class IO
-   def self.read(*args)
--    File.open(args[0], "rb") { |f| f.read(args[1]) }
-+    length = args[1]
-+    offset = args[2]
-+    opt = args[3]
-+    if length.kind_of? Hash
-+      opt = length
-+      length = nil
-+    elsif offset.kind_of? Hash
-+      opt = offset
-+      offset = nil
-+    end
-+    if opt && opt.has_key?(:mode)
-+      File.open(args[0], opt) { |f| f.read(length) }
-+    else
-+      File.open(args[0], "rb", opt) { |f| f.read(length) }
-+    end
-   end
- end
- 
diff --git a/debian/patches/series b/debian/patches/series
index e9ca398..82c8535 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 0001-Do-not-run-test-for-winrm-transport.patch
 0002-Remove-useless-gem-minitest-from-spec_helper.patch
 0003-Remove-CI-stuff.patch
-0004-Fix-monkey-patching-of-IO.read.patch
 0005-Do-not-change-LOAD_PATH-and-do-not-use-rubygems-in-b.patch
 0006-Search-for-support-in-usr-share-test-kitchen.patch
 0007-Disable-test-failing-under-Gem2Deb-Rake-TestTask.patch

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