[DRE-commits] [ohai] 03/03: restrict tests of the Ruby plugin to the default Ruby interpreter

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ohai.

commit 1431eff511b4d3452eb66183b56f1310216caec6
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Wed Jun 17 21:30:17 2015 -0300

    restrict tests of the Ruby plugin to the default Ruby interpreter
---
 debian/changelog                                       |  2 ++
 ...003-Ruby-plugin-run-only-against-default-Ruby.patch | 18 ++++++++++++++++++
 debian/patches/series                                  |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d0a5a1c..e68f056 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ ohai (8.4.0-1) unstable; urgency=medium
     dependency
   * Add 0002-Avoid-dependency-on-rspec-collection_matchers.patch to make the
     tests not depend on an unpackage rspec extension.
+  * Add 0003-Ruby-plugin-run-only-against-default-Ruby.patch: restrict tests
+    of the Ruby plugin to the default Ruby interpreter.
 
  -- Antonio Terceiro <terceiro at debian.org>  Tue, 16 Jun 2015 20:39:55 -0300
 
diff --git a/debian/patches/0003-Ruby-plugin-run-only-against-default-Ruby.patch b/debian/patches/0003-Ruby-plugin-run-only-against-default-Ruby.patch
new file mode 100644
index 0000000..4631463
--- /dev/null
+++ b/debian/patches/0003-Ruby-plugin-run-only-against-default-Ruby.patch
@@ -0,0 +1,18 @@
+From: Antonio Terceiro <terceiro at debian.org>
+Date: Wed, 17 Jun 2015 21:07:18 -0300
+Subject: Ruby plugin: run only against default Ruby
+
+---
+ spec/unit/plugins/ruby_spec.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spec/unit/plugins/ruby_spec.rb b/spec/unit/plugins/ruby_spec.rb
+index cf8d82b..16f746c 100644
+--- a/spec/unit/plugins/ruby_spec.rb
++++ b/spec/unit/plugins/ruby_spec.rb
+@@ -57,4 +57,4 @@ describe Ohai::System, "plugin ruby" do
+     end
+   end
+   
+-end
++end if ENV['RUBY_TEST_BIN'] == File.basename(ruby_bin)
diff --git a/debian/patches/series b/debian/patches/series
index 8e72fd8..83016c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Drop-dependency-on-wmi-lite.patch
 0002-Avoid-dependency-on-rspec-collection_matchers.patch
+0003-Ruby-plugin-run-only-against-default-Ruby.patch

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