diff options
author | Tim Smith <tsmith84@gmail.com> | 2016-03-04 16:23:34 -0800 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2016-03-07 10:07:30 -0800 |
commit | 56eca063f3b58990c7396a4f1dcca9702dfdb55d (patch) | |
tree | 90125f9ddfda23bc3cf7f38c30ef1c83cd08473a | |
parent | dece33cb1dcacab8d556f421fc68fbd1f38ed067 (diff) | |
download | ohai-56eca063f3b58990c7396a4f1dcca9702dfdb55d.tar.gz |
Fixup the existing tests
We'll want a few more tests to be added here
-rw-r--r-- | lib/ohai/mixin/dmi_decode.rb | 2 | ||||
-rw-r--r-- | spec/unit/plugins/solaris2/virtualization_spec.rb | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/lib/ohai/mixin/dmi_decode.rb b/lib/ohai/mixin/dmi_decode.rb index 619a0f36..8ec109f5 100644 --- a/lib/ohai/mixin/dmi_decode.rb +++ b/lib/ohai/mixin/dmi_decode.rb @@ -21,7 +21,7 @@ module ::Ohai::Mixin::DmiDecode dmi_data.each_line do |line| case line when /Manufacturer: Microsoft/ - if dmi_data =~ /Product Name: Virtual Machine/ + if dmi_data =~ /Product.*: Virtual Machine/ if dmi_data =~ /Version: (7.0|Hyper-V)/ return "hyperv" elsif dmi_data =~ /Version: (VS2005R2|6.0)/ diff --git a/spec/unit/plugins/solaris2/virtualization_spec.rb b/spec/unit/plugins/solaris2/virtualization_spec.rb index 6e1b95e9..e0f950e3 100644 --- a/spec/unit/plugins/solaris2/virtualization_spec.rb +++ b/spec/unit/plugins/solaris2/virtualization_spec.rb @@ -30,16 +30,16 @@ PSRINFO_PV allow(@plugin).to receive(:collect_os).and_return(:solaris2) # default to all requested Files not existing - allow(File).to receive(:exists?).with("/usr/sbin/psrinfo").and_return(false) - allow(File).to receive(:exists?).with("/usr/sbin/smbios").and_return(false) - allow(File).to receive(:exists?).with("/usr/sbin/zoneadm").and_return(false) + allow(File).to receive(:exist?).with("/usr/sbin/psrinfo").and_return(false) + allow(File).to receive(:exist?).with("/usr/sbin/smbios").and_return(false) + allow(File).to receive(:exist?).with("/usr/sbin/zoneadm").and_return(false) allow(@plugin).to receive(:shell_out).with("/usr/sbin/smbios").and_return(mock_shell_out(0, "", "")) allow(@plugin).to receive(:shell_out).with("#{ Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, "", "")) end describe "when we are checking for kvm" do before(:each) do - expect(File).to receive(:exists?).with("/usr/sbin/psrinfo").and_return(true) + expect(File).to receive(:exist?).with("/usr/sbin/psrinfo").and_return(true) end it "should run psrinfo -pv" do @@ -52,18 +52,19 @@ PSRINFO_PV @plugin.run expect(@plugin[:virtualization][:system]).to eq("kvm") expect(@plugin[:virtualization][:role]).to eq("guest") + expect(@plugin[:virtualization][:systems][:kvm]).to eq("guest") end it "should not set virtualization if kvm isn't there" do expect(@plugin).to receive(:shell_out).with("#{ Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, @psrinfo_pv, "")) @plugin.run - expect(@plugin[:virtualization]).to eq({}) + expect(@plugin[:virtualization][:systems]).to eq({}) end end describe "when we are parsing smbios" do before(:each) do - expect(File).to receive(:exists?).with("/usr/sbin/smbios").and_return(true) + expect(File).to receive(:exist?).with("/usr/sbin/smbios").and_return(true) end it "should run smbios" do @@ -107,17 +108,18 @@ VMWARE @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]).to eq({}) + expect(@plugin[:virtualization][:systems]).to eq({}) end end it "should not set virtualization if no tests match" do @plugin.run - expect(@plugin[:virtualization]).to eq({}) + expect(@plugin[:virtualization][:systems]).to eq({}) end end |