summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsersut <serdar@opscode.com>2014-01-17 10:51:56 -0800
committersersut <serdar@opscode.com>2014-03-07 12:33:19 -0800
commita9208c6825228b6d1ee1d6a8e5cad4a1349641cb (patch)
treeae19a1869ff04732151dcd2a292aa2e9c8bcb7b7
parent8466b2ba237e6d579c92b3e39084d0d2ad027f4b (diff)
downloadchef-a9208c6825228b6d1ee1d6a8e5cad4a1349641cb.tar.gz
Remove the unneeded running of "os" plugin.
-rw-r--r--spec/functional/resource/base.rb2
-rw-r--r--spec/spec_helper.rb2
-rw-r--r--spec/support/shared/functional/windows_script.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/functional/resource/base.rb b/spec/functional/resource/base.rb
index 48a53fe4aa..056db39877 100644
--- a/spec/functional/resource/base.rb
+++ b/spec/functional/resource/base.rb
@@ -22,7 +22,7 @@ def ohai
# provider is platform-dependent, we need platform ohai data:
@OHAI_SYSTEM ||= begin
ohai = Ohai::System.new
- ohai.all_plugins(["os", "platform"])
+ ohai.all_plugins("platform")
ohai
end
end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c7ebb11d3f..88e38bdc4b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -87,7 +87,7 @@ Dir["spec/support/**/*.rb"].
each { |f| require f }
OHAI_SYSTEM = Ohai::System.new
-OHAI_SYSTEM.all_plugins(["os", "platform"])
+OHAI_SYSTEM.all_plugins("platform")
TEST_PLATFORM = OHAI_SYSTEM["platform"].dup.freeze
TEST_PLATFORM_VERSION = OHAI_SYSTEM["platform_version"].dup.freeze
diff --git a/spec/support/shared/functional/windows_script.rb b/spec/support/shared/functional/windows_script.rb
index 4e7361cf60..db2882e1a1 100644
--- a/spec/support/shared/functional/windows_script.rb
+++ b/spec/support/shared/functional/windows_script.rb
@@ -23,7 +23,7 @@ shared_context Chef::Resource::WindowsScript do
before(:all) do
ohai_reader = Ohai::System.new
- ohai_reader.all_plugins(["os", "platform"])
+ ohai_reader.all_plugins("platform")
new_node = Chef::Node.new
new_node.consume_external_attrs(ohai_reader.data,{})