Fixup solaris specs

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

3 files changed, 11 insertions, 50 deletions

diff --git a/lib/ohai/plugins/solaris2/virtualization.rb b/lib/ohai/plugins/solaris2/virtualization.rb
index e0a73bcf..d0187e87 100644
--- a/lib/ohai/plugins/solaris2/virtualization.rb
+++ b/lib/ohai/plugins/solaris2/virtualization.rb
@@ -19,6 +19,8 @@
 #
 
 Ohai.plugin(:Virtualization) do
+  require "ohai/mixin/dmi_decode"
+  include Ohai::Mixin::DmiDecode
   provides "virtualization"
   depends "dmi"
 
@@ -29,9 +31,6 @@ Ohai.plugin(:Virtualization) do
   end
 
   collect_data(:solaris2) do
-    require "ohai/mixin/dmi_decode"
-    include Ohai::Mixin::DmiDecode
-
     virtualization Mash.new
     virtualization[:systems] = Mash.new
 
diff --git a/spec/unit/plugins/solaris2/dmi_spec.rb b/spec/unit/plugins/solaris2/dmi_spec.rb
index 25192dd9..b4bfdfab 100644
--- a/spec/unit/plugins/solaris2/dmi_spec.rb
+++ b/spec/unit/plugins/solaris2/dmi_spec.rb
@@ -112,17 +112,16 @@ SOLARIS_DMI_OUT = <<~EOS.freeze
 EOS
 
 describe Ohai::System, "Solaris2.X DMI plugin" do
-  let(:plugin) { get_plugin("solaris/dmi") }
-
   before(:each) do
-    allow(plugin).to receive(:collect_os).and_return("solaris2")
+    @plugin = get_plugin("solaris2/dmi")
+    allow(@plugin).to receive(:collect_os).and_return("solaris2")
     @stdout = SOLARIS_DMI_OUT
-    allow(plugin).to receive(:shell_out).with("smbios").and_return(mock_shell_out(0, @stdout, ""))
+    allow(@plugin).to receive(:shell_out).with("smbios").and_return(mock_shell_out(0, @stdout, ""))
   end
 
   it "should run smbios" do
-    expect(plugin).to receive(:shell_out).with("smbios").and_return(mock_shell_out(0, @stdout, ""))
-    plugin.run
+    expect(@plugin).to receive(:shell_out).with("smbios").and_return(mock_shell_out(0, @stdout, ""))
+    @plugin.run
   end
 
   {
@@ -141,14 +140,14 @@ describe Ohai::System, "Solaris2.X DMI plugin" do
   }.each do |id, data|
     data.each do |attribute, value|
       it "should have [:dmi][:#{id}][:#{attribute}] set" do
-        plugin.run
-        expect(plugin[:dmi][id][attribute]).to eql(value)
+        @plugin.run
+        expect(@plugin[:dmi][id][attribute]).to eql(value)
       end
     end
   end
 
   it "should ignore unwanted types" do
-    plugin.run
-    expect(plugin[:dmi]).not_to have_key(:on_board_devices)
+    @plugin.run
+    expect(@plugin[:dmi]).not_to have_key(:on_board_devices)
   end
 end
diff --git a/spec/unit/plugins/solaris2/virtualization_spec.rb b/spec/unit/plugins/solaris2/virtualization_spec.rb
index c50f2aed..1208c203 100644
--- a/spec/unit/plugins/solaris2/virtualization_spec.rb
+++ b/spec/unit/plugins/solaris2/virtualization_spec.rb
@@ -63,43 +63,6 @@ PSRINFO_PV
     end
   end
 
-  describe "when we are parsing smbios" do
-    before(:each) do
-      expect(File).to receive(:exist?).with("/usr/sbin/smbios").and_return(true)
-    end
-
-    it "should run smbios" do
-      expect(plugin).to receive(:shell_out).with("/usr/sbin/smbios")
-      plugin.run
-    end
-
-    it "should set vmware guest if smbios detects VMware Virtual Platform" do
-      vmware_smbios = <<~VMWARE
-        ID    SIZE TYPE
-        1     72   SMB_TYPE_SYSTEM (system information)
-
-          Manufacturer: VMware, Inc.
-          Product: VMware Virtual Platform
-          Version: None
-          Serial Number: VMware-50 3f f7 14 42 d1 f1 da-3b 46 27 d0 29 b4 74 1d
-
-          UUID: a86cc405-e1b9-447b-ad05-6f8db39d876a
-          Wake-Up Event: 0x6 (power switch)
-VMWARE
-      allow(plugin).to receive(:shell_out).with("/usr/sbin/smbios").and_return(mock_shell_out(0, vmware_smbios, ""))
-      plugin.run
-      expect(plugin[:virtualization][:system]).to eq("vmware")
-      expect(plugin[:virtualization][:role]).to eq("guest")
-      expect(plugin[:virtualization][:systems][:vmware]).to eq("guest")
-    end
-
-    it "should run smbios and not set virtualization if nothing is detected" do
-      expect(plugin).to receive(:shell_out).with("/usr/sbin/smbios")
-      plugin.run
-      expect(plugin[:virtualization][:systems]).to eq({})
-    end
-  end
-
   describe "when we are parsing DMI data" do
 
     it "sets virtualization attributes if the appropriate DMI data is present" do