Merge ohai resource / provider into a single resource

Simplify this resource and squash some files

Signed-off-by: Tim Smith <tsmith@chef.io>

1 files changed, 0 insertions, 84 deletions

diff --git a/spec/unit/provider/ohai_spec.rb b/spec/unit/provider/ohai_spec.rb
deleted file mode 100644
index 11f11e3373..0000000000
--- a/spec/unit/provider/ohai_spec.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Author:: Michael Leinartas (<mleinartas@gmail.com>)
-# Copyright:: Copyright 2010-2016, Michael Leinartas
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-#
-
-require "spec_helper"
-
-require "chef/run_context"
-
-describe Chef::Provider::Ohai do
-  before(:each) do
-    # Copied from client_spec
-    @fqdn = "hostname.domainname"
-    @hostname = "hostname"
-    @platform = "example-platform"
-    @platform_version = "example-platform"
-    Chef::Config[:node_name] = @fqdn
-    mock_ohai = {
-      fqdn: @fqdn,
-      hostname: @hostname,
-      platform: @platform,
-      platform_version: @platform_version,
-      data: {
-        origdata: "somevalue",
-      },
-      data2: {
-        origdata: "somevalue",
-        newdata: "somevalue",
-      },
-    }
-    allow(mock_ohai).to receive(:all_plugins).and_return(true)
-    allow(mock_ohai).to receive(:data).and_return(mock_ohai[:data],
-      mock_ohai[:data2])
-    allow(Ohai::System).to receive(:new).and_return(mock_ohai)
-    allow(Chef::Platform).to receive(:find_platform_and_version).and_return({ "platform" => @platform,
-                                                                              "platform_version" => @platform_version })
-    # Fake node with a dummy save
-    @node = Chef::Node.new
-    @node.name(@fqdn)
-    allow(@node).to receive(:save).and_return(@node)
-    @events = Chef::EventDispatch::Dispatcher.new
-    @run_context = Chef::RunContext.new(@node, {}, @events)
-    @new_resource = Chef::Resource::Ohai.new("ohai_reload")
-    ohai = Ohai::System.new
-    ohai.all_plugins
-    @node.consume_external_attrs(ohai.data, {})
-
-    @provider = Chef::Provider::Ohai.new(@new_resource, @run_context)
-  end
-
-  describe "when reloading ohai" do
-    before do
-      @node.automatic_attrs[:origdata] = "somevalue"
-    end
-
-    it "applies updated ohai data to the node" do
-      expect(@node[:origdata]).to eq("somevalue")
-      expect(@node[:newdata]).to be_nil
-      @provider.run_action(:reload)
-      expect(@node[:origdata]).to eq("somevalue")
-      expect(@node[:newdata]).to eq("somevalue")
-    end
-
-    it "should reload a specific plugin and cause node to pick up new values" do
-      @new_resource.plugin "someplugin"
-      @provider.run_action(:reload)
-      expect(@node[:origdata]).to eq("somevalue")
-      expect(@node[:newdata]).to eq("somevalue")
-    end
-  end
-end