[DRE-commits] [ohai] 04/04: refresh patches
Antonio Terceiro
terceiro at moszumanska.debian.org
Mon Oct 31 12:56:00 UTC 2016
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository ohai.
commit aee38c58dc0cc7152f7f529ba476620c1715ebc5
Author: Antonio Terceiro <terceiro at debian.org>
Date: Mon Oct 31 10:48:22 2016 -0200
refresh patches
---
debian/changelog | 1 +
.../0003-Mark-Windows-only-tests-as-such.patch | 30 +++++++++++++++++++++-
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 33d5c51..489b1bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
ohai (8.21.0-1) unstable; urgency=medium
* New upstream version 8.21.0
+ * refresh patches
-- Antonio Terceiro <terceiro at debian.org> Mon, 31 Oct 2016 10:44:19 -0200
diff --git a/debian/patches/0003-Mark-Windows-only-tests-as-such.patch b/debian/patches/0003-Mark-Windows-only-tests-as-such.patch
index da85bcc..119f2fe 100644
--- a/debian/patches/0003-Mark-Windows-only-tests-as-such.patch
+++ b/debian/patches/0003-Mark-Windows-only-tests-as-such.patch
@@ -3,10 +3,25 @@ Date: Mon, 19 Sep 2016 14:42:35 -0300
Subject: Mark Windows-only tests as such
---
+ spec/functional/plugins/windows/uptime_spec.rb | 2 +-
spec/unit/plugins/windows/cpu_spec.rb | 2 +-
+ spec/unit/plugins/windows/uptime_spec.rb | 2 +-
spec/unit/plugins/windows/virtualization_spec.rb | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+diff --git a/spec/functional/plugins/windows/uptime_spec.rb b/spec/functional/plugins/windows/uptime_spec.rb
+index d1abd68..1062aff 100644
+--- a/spec/functional/plugins/windows/uptime_spec.rb
++++ b/spec/functional/plugins/windows/uptime_spec.rb
+@@ -18,7 +18,7 @@
+
+ require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+
+-describe Ohai::System, "Windows plugin uptime" do
++describe Ohai::System, "Windows plugin uptime", :windows_only do
+
+ context "for newer version of Windows" do
+ let(:uptime_plugin) do
diff --git a/spec/unit/plugins/windows/cpu_spec.rb b/spec/unit/plugins/windows/cpu_spec.rb
index 313104b..fdb65c3 100644
--- a/spec/unit/plugins/windows/cpu_spec.rb
@@ -20,6 +35,19 @@ index 313104b..fdb65c3 100644
before(:each) do
@plugin = get_plugin("windows/cpu")
allow(@plugin).to receive(:collect_os).and_return(:windows)
+diff --git a/spec/unit/plugins/windows/uptime_spec.rb b/spec/unit/plugins/windows/uptime_spec.rb
+index 05d2fd2..6b2a57b 100644
+--- a/spec/unit/plugins/windows/uptime_spec.rb
++++ b/spec/unit/plugins/windows/uptime_spec.rb
+@@ -18,7 +18,7 @@
+
+ require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+
+-describe Ohai::System, "Windows plugin uptime" do
++describe Ohai::System, "Windows plugin uptime", :windows_only do
+
+ let(:wmi) { double("wmi", { :first_of => "" }) }
+
diff --git a/spec/unit/plugins/windows/virtualization_spec.rb b/spec/unit/plugins/windows/virtualization_spec.rb
index 124e92f..4f25691 100644
--- a/spec/unit/plugins/windows/virtualization_spec.rb
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ohai.git
More information about the Pkg-ruby-extras-commits
mailing list