[DRE-commits] [test-kitchen] 04/09: Add 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 test-kitchen.

commit ae760f86f8b715f6ad2aa85fd0702e83df3acda2
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Tue Jun 30 00:00:33 2015 +0300

    Add patches
---
 .../0001-Do-not-run-test-for-winrm-transport.patch | 26 ++++++++++++++++
 ...ove-useless-gem-minitest-from-spec_helper.patch | 21 +++++++++++++
 debian/patches/0003-Remove-CI-staff.patch          | 36 ++++++++++++++++++++++
 .../0004-Fix-monkey-patching-of-IO.read.patch      | 35 +++++++++++++++++++++
 debian/patches/series                              |  4 +++
 5 files changed, 122 insertions(+)

diff --git a/debian/patches/0001-Do-not-run-test-for-winrm-transport.patch b/debian/patches/0001-Do-not-run-test-for-winrm-transport.patch
new file mode 100644
index 0000000..7a16387
--- /dev/null
+++ b/debian/patches/0001-Do-not-run-test-for-winrm-transport.patch
@@ -0,0 +1,26 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Mon, 29 Jun 2015 20:31:56 +0300
+Subject: Do not run test for winrm transport
+
+---
+ spec/kitchen/transport/winrm_spec.rb | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/spec/kitchen/transport/winrm_spec.rb b/spec/kitchen/transport/winrm_spec.rb
+index 6af55a3..cdbd601 100644
+--- a/spec/kitchen/transport/winrm_spec.rb
++++ b/spec/kitchen/transport/winrm_spec.rb
+@@ -15,7 +15,7 @@
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+-
++=begin
+ require_relative "../../spec_helper"
+ 
+ require "kitchen/transport/winrm"
+@@ -1147,3 +1147,4 @@ MSG
+     %r{^W, .* : #{Regexp.escape(msg)}}
+   end
+ end
++=end
diff --git a/debian/patches/0002-Remove-useless-gem-minitest-from-spec_helper.patch b/debian/patches/0002-Remove-useless-gem-minitest-from-spec_helper.patch
new file mode 100644
index 0000000..748d1c2
--- /dev/null
+++ b/debian/patches/0002-Remove-useless-gem-minitest-from-spec_helper.patch
@@ -0,0 +1,21 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Mon, 29 Jun 2015 20:32:58 +0300
+Subject: Remove useless 'gem "minitest"' from spec_helper
+
+---
+ spec/spec_helper.rb | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 08de316..c92f41d 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -16,8 +16,6 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
+-gem "minitest"
+-
+ if ENV["CODECLIMATE_REPO_TOKEN"]
+   require "codeclimate-test-reporter"
+   CodeClimate::TestReporter.start
diff --git a/debian/patches/0003-Remove-CI-staff.patch b/debian/patches/0003-Remove-CI-staff.patch
new file mode 100644
index 0000000..f99a73d
--- /dev/null
+++ b/debian/patches/0003-Remove-CI-staff.patch
@@ -0,0 +1,36 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Mon, 29 Jun 2015 20:33:22 +0300
+Subject: Remove CI staff
+
+---
+ spec/spec_helper.rb | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index c92f41d..707680f 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -16,23 +16,6 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
+-if ENV["CODECLIMATE_REPO_TOKEN"]
+-  require "codeclimate-test-reporter"
+-  CodeClimate::TestReporter.start
+-elsif ENV["COVERAGE"]
+-  require "simplecov"
+-  SimpleCov.profiles.define "gem" do
+-    command_name "Specs"
+-
+-    add_filter ".gem/"
+-    add_filter "/spec/"
+-    add_filter "/lib/vendor/"
+-
+-    add_group "Libraries", "/lib/"
+-  end
+-  SimpleCov.start "gem"
+-end
+-
+ require "fakefs/safe"
+ require "minitest/autorun"
+ require "mocha/setup"
diff --git a/debian/patches/0004-Fix-monkey-patching-of-IO.read.patch b/debian/patches/0004-Fix-monkey-patching-of-IO.read.patch
new file mode 100644
index 0000000..06f99e3
--- /dev/null
+++ b/debian/patches/0004-Fix-monkey-patching-of-IO.read.patch
@@ -0,0 +1,35 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Mon, 29 Jun 2015 20:39:07 +0300
+Subject: Fix monkey patching of IO.read
+
+---
+ 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
new file mode 100644
index 0000000..e94bd44
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+0001-Do-not-run-test-for-winrm-transport.patch
+0002-Remove-useless-gem-minitest-from-spec_helper.patch
+0003-Remove-CI-staff.patch
+0004-Fix-monkey-patching-of-IO.read.patch

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