diff options
| author | sersut <serdar@opscode.com> | 2014-01-14 14:45:03 -0800 |
|---|---|---|
| committer | sersut <serdar@opscode.com> | 2014-03-07 12:26:01 -0800 |
| commit | bc609179d155b179d9bb24e7460b6e9c6575e6be (patch) | |
| tree | 621314e1bb7773be2f0fc277a996fcdaed790ebf /spec/functional | |
| parent | 59793ac7ad45e8149b33c5b26d76ed2d8164de67 (diff) | |
| download | chef-bc609179d155b179d9bb24e7460b6e9c6575e6be.tar.gz | |
Fix chef spec infra to use OHAI correctly.
Diffstat (limited to 'spec/functional')
| -rw-r--r-- | spec/functional/resource/base.rb | 4 | ||||
| -rw-r--r-- | spec/functional/resource/deploy_revision_spec.rb | 2 | ||||
| -rw-r--r-- | spec/functional/resource/git_spec.rb | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/spec/functional/resource/base.rb b/spec/functional/resource/base.rb index 13438c1759..48a53fe4aa 100644 --- a/spec/functional/resource/base.rb +++ b/spec/functional/resource/base.rb @@ -22,9 +22,7 @@ def ohai # provider is platform-dependent, we need platform ohai data: @OHAI_SYSTEM ||= begin ohai = Ohai::System.new - ohai.require_plugin("os") - ohai.require_plugin("platform") - ohai.require_plugin("passwd") + ohai.all_plugins(["os", "platform"]) ohai end end diff --git a/spec/functional/resource/deploy_revision_spec.rb b/spec/functional/resource/deploy_revision_spec.rb index 425d7acf9c..9ff1391e35 100644 --- a/spec/functional/resource/deploy_revision_spec.rb +++ b/spec/functional/resource/deploy_revision_spec.rb @@ -45,7 +45,7 @@ describe Chef::Resource::DeployRevision, :unix_only => true do before(:all) do @ohai = Ohai::System.new - @ohai.require_plugin("os") + @ohai.all_plugins("os") end let(:node) do diff --git a/spec/functional/resource/git_spec.rb b/spec/functional/resource/git_spec.rb index 7ade6eea21..f0bd94b0c0 100644 --- a/spec/functional/resource/git_spec.rb +++ b/spec/functional/resource/git_spec.rb @@ -92,7 +92,7 @@ E before(:all) do @ohai = Ohai::System.new - @ohai.require_plugin("os") + @ohai.all_plugins("os") end context "working with pathes with special characters" do |