ohai 7.6.0.rc.1 → 8.0.1

data/spec/unit/plugins/rackspace_spec.rb

@@ -15,11 +15,13 @@
 # limitations under the License.
 #
 
+require 'resolv'
+
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 describe Ohai::System, "plugin rackspace" do
   before(:each) do
-    Resolv.stub(:getname).and_return("1.2.3.4")
+    allow(Resolv).to receive(:getname).and_return("1.2.3.4")
     @plugin = get_plugin("rackspace")
     @plugin[:hostname] = "katie"
     @plugin[:network] = {:interfaces => {:eth0 => {"addresses"=> {
@@ -67,13 +69,13 @@ describe Ohai::System, "plugin rackspace" do
 
     # We need a generic stub here for the later stubs with arguments to work
     # Because, magic.
-    @plugin.stub(:shell_out).and_return(mock_shell_out(1, "", ""))
+    allow(@plugin).to receive(:shell_out).and_return(mock_shell_out(1, "", ""))
   end
 
   shared_examples_for "!rackspace"  do
     it "should NOT create rackspace" do
       @plugin.run
-      @plugin[:rackspace].should be_nil
+      expect(@plugin[:rackspace]).to be_nil
     end
   end
 
@@ -81,44 +83,44 @@ describe Ohai::System, "plugin rackspace" do
 
     it "should create rackspace" do
       @plugin.run
-      @plugin[:rackspace].should_not be_nil
+      expect(@plugin[:rackspace]).not_to be_nil
     end
 
     it "should have all required attributes" do
       @plugin.run
-      @plugin[:rackspace][:public_ip].should_not be_nil
-      @plugin[:rackspace][:private_ip].should_not be_nil
-      @plugin[:rackspace][:public_ipv4].should_not be_nil
-      @plugin[:rackspace][:local_ipv4].should_not be_nil
-      @plugin[:rackspace][:public_ipv6].should_not be_nil
-      @plugin[:rackspace][:local_ipv6].should be_nil
-      @plugin[:rackspace][:local_hostname].should_not be_nil
-      @plugin[:rackspace][:public_hostname].should_not be_nil
+      expect(@plugin[:rackspace][:public_ip]).not_to be_nil
+      expect(@plugin[:rackspace][:private_ip]).not_to be_nil
+      expect(@plugin[:rackspace][:public_ipv4]).not_to be_nil
+      expect(@plugin[:rackspace][:local_ipv4]).not_to be_nil
+      expect(@plugin[:rackspace][:public_ipv6]).not_to be_nil
+      expect(@plugin[:rackspace][:local_ipv6]).to be_nil
+      expect(@plugin[:rackspace][:local_hostname]).not_to be_nil
+      expect(@plugin[:rackspace][:public_hostname]).not_to be_nil
     end
 
     it "should resolve hostname if reverse dns is set" do
-      Resolv.stub(:getname).and_return("1234.resolved.com")
+      allow(Resolv).to receive(:getname).and_return("1234.resolved.com")
       @plugin.run
-      @plugin[:rackspace][:public_hostname].should == "1234.resolved.com"
+      expect(@plugin[:rackspace][:public_hostname]).to eq("1234.resolved.com")
     end
 
     [Resolv::ResolvError, Resolv::ResolvTimeout].each do |exception|
       it "should return ip address when reverse dns returns exception: #{exception}" do
-        Resolv.stub(:getname).and_raise(exception)
+        allow(Resolv).to receive(:getname).and_raise(exception)
         @plugin.run
-        @plugin[:rackspace][:public_hostname].should == "1.2.3.4"
+        expect(@plugin[:rackspace][:public_hostname]).to eq("1.2.3.4")
       end
     end
 
     it "should have correct values for all attributes" do
       @plugin.run
-      @plugin[:rackspace][:public_ip].should == "1.2.3.4"
-      @plugin[:rackspace][:private_ip].should == "5.6.7.8"
-      @plugin[:rackspace][:public_ipv4].should == "1.2.3.4"
-      @plugin[:rackspace][:local_ipv4].should == "5.6.7.8"
-      @plugin[:rackspace][:public_ipv6].should == "2a00:1a48:7805:111:e875:efaf:ff08:75"
-      @plugin[:rackspace][:local_hostname].should == 'katie'
-      @plugin[:rackspace][:public_hostname].should == "1.2.3.4"
+      expect(@plugin[:rackspace][:public_ip]).to eq("1.2.3.4")
+      expect(@plugin[:rackspace][:private_ip]).to eq("5.6.7.8")
+      expect(@plugin[:rackspace][:public_ipv4]).to eq("1.2.3.4")
+      expect(@plugin[:rackspace][:local_ipv4]).to eq("5.6.7.8")
+      expect(@plugin[:rackspace][:public_ipv6]).to eq("2a00:1a48:7805:111:e875:efaf:ff08:75")
+      expect(@plugin[:rackspace][:local_hostname]).to eq('katie')
+      expect(@plugin[:rackspace][:public_hostname]).to eq("1.2.3.4")
     end
 
     it "should capture region information" do
@@ -129,9 +131,9 @@ server_id = "21301000"
 created_at = "2012-12-06T22:08:16Z"
 region = "dfw"
 OUT
-      @plugin.stub(:shell_out).with("xenstore-ls vm-data/provider_data").and_return(mock_shell_out(0, provider_data, ""))
+      allow(@plugin).to receive(:shell_out).with("xenstore-ls vm-data/provider_data").and_return(mock_shell_out(0, provider_data, ""))
       @plugin.run
-      @plugin[:rackspace][:region].should == "dfw"
+      expect(@plugin[:rackspace][:region]).to eq("dfw")
     end
   end
 
@@ -139,13 +141,13 @@ OUT
     it_should_behave_like "rackspace"
 
     before(:each) do
-      Resolv.stub(:getname).and_raise(Resolv::ResolvError)
-      File.stub(:exist?).with('/etc/chef/ohai/hints/rackspace.json').and_return(true)
-      File.stub(:read).with('/etc/chef/ohai/hints/rackspace.json').and_return('')
-      File.stub(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(true)
-      File.stub(:read).with('C:\chef\ohai\hints/rackspace.json').and_return('')
-      File.stub(:exist?).with('/etc/resolv.conf').and_return(true)
-      File.stub(:read).with('/etc/resolv.conf').and_return('')
+      allow(Resolv).to receive(:getname).and_raise(Resolv::ResolvError)
+      allow(File).to receive(:exist?).with('/etc/chef/ohai/hints/rackspace.json').and_return(true)
+      allow(File).to receive(:read).with('/etc/chef/ohai/hints/rackspace.json').and_return('')
+      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(true)
+      allow(File).to receive(:read).with('C:\chef\ohai\hints/rackspace.json').and_return('')
+      allow(File).to receive(:exist?).with('/etc/resolv.conf').and_return(true)
+      allow(File).to receive(:read).with('/etc/resolv.conf').and_return('')
     end
 
     describe 'with no public interfaces (empty eth0)' do
@@ -157,22 +159,22 @@ OUT
       it "should have all required attributes" do
         @plugin.run
         # expliticly nil
-        @plugin[:rackspace][:public_ip].should be_nil
-        @plugin[:rackspace][:public_ipv4].should be_nil
-        @plugin[:rackspace][:public_ipv6].should be_nil
-        @plugin[:rackspace][:public_hostname].should be_nil
+        expect(@plugin[:rackspace][:public_ip]).to be_nil
+        expect(@plugin[:rackspace][:public_ipv4]).to be_nil
+        expect(@plugin[:rackspace][:public_ipv6]).to be_nil
+        expect(@plugin[:rackspace][:public_hostname]).to be_nil
         # per normal
-        @plugin[:rackspace][:private_ip].should_not be_nil
-        @plugin[:rackspace][:local_ipv4].should_not be_nil
-        @plugin[:rackspace][:local_ipv6].should be_nil
-        @plugin[:rackspace][:local_hostname].should_not be_nil
+        expect(@plugin[:rackspace][:private_ip]).not_to be_nil
+        expect(@plugin[:rackspace][:local_ipv4]).not_to be_nil
+        expect(@plugin[:rackspace][:local_ipv6]).to be_nil
+        expect(@plugin[:rackspace][:local_hostname]).not_to be_nil
       end
 
       it "should have correct values for all attributes" do
         @plugin.run
-        @plugin[:rackspace][:private_ip].should == "5.6.7.8"
-        @plugin[:rackspace][:local_ipv4].should == "5.6.7.8"
-        @plugin[:rackspace][:local_hostname].should == 'katie'
+        expect(@plugin[:rackspace][:private_ip]).to eq("5.6.7.8")
+        expect(@plugin[:rackspace][:local_ipv4]).to eq("5.6.7.8")
+        expect(@plugin[:rackspace][:local_hostname]).to eq('katie')
       end
     end
   end
@@ -181,8 +183,8 @@ OUT
     it_should_behave_like "!rackspace"
 
     before(:each) do
-      File.stub(:exist?).with('/etc/chef/ohai/hints/rackspace.json').and_return(false)
-      File.stub(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(false)
+      allow(File).to receive(:exist?).with('/etc/chef/ohai/hints/rackspace.json').and_return(false)
+      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(false)
     end
   end
 
@@ -190,13 +192,13 @@ OUT
     it_should_behave_like "!rackspace"
 
     before(:each) do
-      File.stub(:exist?).with('/etc/chef/ohai/hints/ec2.json').and_return(true)
-      File.stub(:read).with('/etc/chef/ohai/hints/ec2.json').and_return('')
-      File.stub(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(true)
-      File.stub(:read).with('C:\chef\ohai\hints/ec2.json').and_return('')
+      allow(File).to receive(:exist?).with('/etc/chef/ohai/hints/ec2.json').and_return(true)
+      allow(File).to receive(:read).with('/etc/chef/ohai/hints/ec2.json').and_return('')
+      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(true)
+      allow(File).to receive(:read).with('C:\chef\ohai\hints/ec2.json').and_return('')
 
-      File.stub(:exist?).with('/etc/chef/ohai/hints/rackspace.json').and_return(false)
-      File.stub(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(false)
+      allow(File).to receive(:exist?).with('/etc/chef/ohai/hints/rackspace.json').and_return(false)
+      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(false)
     end
   end
 
@@ -205,7 +207,7 @@ OUT
 
     before(:each) do
       stdout = "Rackspace\n"
-      @plugin.stub(:shell_out).with("xenstore-read vm-data/provider_data/provider").and_return(mock_shell_out(0, stdout, "" ))
+      allow(@plugin).to receive(:shell_out).with("xenstore-read vm-data/provider_data/provider").and_return(mock_shell_out(0, stdout, "" ))
     end
   end
 
@@ -214,26 +216,26 @@ OUT
 
     before(:each) do
       stdout = "cumulonimbus\n"
-      @plugin.stub(:shell_out).with("xenstore-read vm-data/provider_data/provider").and_return(mock_shell_out(0, stdout, "" ))
+      allow(@plugin).to receive(:shell_out).with("xenstore-read vm-data/provider_data/provider").and_return(mock_shell_out(0, stdout, "" ))
     end
   end
 
   describe "does not have private networks" do
     before do
       stdout = 'BC764E20422B = "{"label": "public"}"\n'
-      @plugin.stub(:shell_out).with("xenstore-ls vm-data/networking").and_return(mock_shell_out(0, stdout, "" ))
+      allow(@plugin).to receive(:shell_out).with("xenstore-ls vm-data/networking").and_return(mock_shell_out(0, stdout, "" ))
       stdout = '{"label": "public", "broadcast": "9.10.11.255", "ips": [{"ip": "9.10.11.12", "netmask": "255.255.255.0", "enabled": "1", "gateway": null}], "mac": "BC:76:4E:20:42:2B", "dns": ["69.20.0.164", "69.20.0.196"], "gateway": null}'
-      @plugin.stub(:shell_out).with("xenstore-read vm-data/networking/BC764E20422B").and_return(mock_shell_out(0, stdout, "" ))
+      allow(@plugin).to receive(:shell_out).with("xenstore-read vm-data/networking/BC764E20422B").and_return(mock_shell_out(0, stdout, "" ))
 
-      File.stub(:exist?).with('/etc/chef/ohai/hints/rackspace.json').and_return(true)
-      File.stub(:read).with('/etc/chef/ohai/hints/rackspace.json').and_return('')
-      File.stub(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(true)
-      File.stub(:read).with('C:\chef\ohai\hints/rackspace.json').and_return('')
+      allow(File).to receive(:exist?).with('/etc/chef/ohai/hints/rackspace.json').and_return(true)
+      allow(File).to receive(:read).with('/etc/chef/ohai/hints/rackspace.json').and_return('')
+      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(true)
+      allow(File).to receive(:read).with('C:\chef\ohai\hints/rackspace.json').and_return('')
     end
 
     it "should not have private_networks object" do
       @plugin.run
-      @plugin[:rackspace][:private_networks].should == []
+      expect(@plugin[:rackspace][:private_networks]).to eq([])
     end
   end
 
@@ -255,26 +257,26 @@ OUT
         }
       }}
       stdout = 'BC764E20422B = "{"label": "private-network"}"\n'
-      @plugin.stub(:shell_out).with("xenstore-ls vm-data/networking").and_return(mock_shell_out(0, stdout, "" ))
+      allow(@plugin).to receive(:shell_out).with("xenstore-ls vm-data/networking").and_return(mock_shell_out(0, stdout, "" ))
       stdout = '{"label": "private-network", "broadcast": "9.10.11.255", "ips": [{"ip": "9.10.11.12", "netmask": "255.255.255.0", "enabled": "1", "gateway": null}], "mac": "BC:76:4E:20:42:2B", "dns": ["69.20.0.164", "69.20.0.196"], "gateway": null}'
-      @plugin.stub(:shell_out).with("xenstore-read vm-data/networking/BC764E20422B").and_return(mock_shell_out(0, stdout, "" ))
+      allow(@plugin).to receive(:shell_out).with("xenstore-read vm-data/networking/BC764E20422B").and_return(mock_shell_out(0, stdout, "" ))
 
-      File.stub(:exist?).with('/etc/chef/ohai/hints/rackspace.json').and_return(true)
-      File.stub(:read).with('/etc/chef/ohai/hints/rackspace.json').and_return('')
-      File.stub(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(true)
-      File.stub(:read).with('C:\chef\ohai\hints/rackspace.json').and_return('')
+      allow(File).to receive(:exist?).with('/etc/chef/ohai/hints/rackspace.json').and_return(true)
+      allow(File).to receive(:read).with('/etc/chef/ohai/hints/rackspace.json').and_return('')
+      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(true)
+      allow(File).to receive(:read).with('C:\chef\ohai\hints/rackspace.json').and_return('')
     end
 
     it "should private_networks object" do
       @plugin.run
-      @plugin[:rackspace][:private_networks].should_not be_nil
+      expect(@plugin[:rackspace][:private_networks]).not_to be_nil
     end
 
     it "should have correct values for all attributes" do
       @plugin.run
-      @plugin[:rackspace][:private_networks][0][:label].should == "private-network"
-      @plugin[:rackspace][:private_networks][0][:broadcast].should == "9.10.11.255"
-      @plugin[:rackspace][:private_networks][0][:mac].should == "BC:76:4E:20:42:2B"
+      expect(@plugin[:rackspace][:private_networks][0][:label]).to eq("private-network")
+      expect(@plugin[:rackspace][:private_networks][0][:broadcast]).to eq("9.10.11.255")
+      expect(@plugin[:rackspace][:private_networks][0][:mac]).to eq("BC:76:4E:20:42:2B")
     end
 
   end

data/spec/unit/plugins/root_group_spec.rb

@@ -30,49 +30,49 @@ describe Ohai::System, 'root_group' do
       # apparently didn't apply to this api. we're just trying to fake
       # Etc.getgrgid(Etc.getpwnam('root').gid).name
       @pwnam = Object.new
-      @pwnam.stub(:gid).and_return(0)
-      Etc.stub(:getpwnam).with('root').and_return(@pwnam)
+      allow(@pwnam).to receive(:gid).and_return(0)
+      allow(Etc).to receive(:getpwnam).with('root').and_return(@pwnam)
       @grgid = Object.new
-      Etc.stub(:getgrgid).and_return(@grgid)
+      allow(Etc).to receive(:getgrgid).and_return(@grgid)
     end
 
     describe 'with wheel group' do
       before(:each) do
-        @grgid.stub(:name).and_return('wheel')
+        allow(@grgid).to receive(:name).and_return('wheel')
       end
       it 'should have a root_group of wheel' do
         @plugin.run
-        @plugin[:root_group].should == 'wheel'
+        expect(@plugin[:root_group]).to eq('wheel')
       end
     end
 
     describe 'with root group' do
       before(:each) do
-        @grgid.stub(:name).and_return('root')
+        allow(@grgid).to receive(:name).and_return('root')
       end
       it 'should have a root_group of root' do
         @plugin.run
-        @plugin[:root_group].should == 'root'
+        expect(@plugin[:root_group]).to eq('root')
       end
     end
 
     describe 'platform hpux with sys group' do
       before(:each) do
-        @pwnam.stub(:gid).and_return(3)
-        @grgid.stub(:name).and_return('sys')
+        allow(@pwnam).to receive(:gid).and_return(3)
+        allow(@grgid).to receive(:name).and_return('sys')
       end
       it 'should have a root_group of sys' do
         @plugin.run
-        @plugin[:root_group].should == 'sys'
+        expect(@plugin[:root_group]).to eq('sys')
       end
     end
     describe 'platform aix with system group' do
       before(:each) do
-        @grgid.stub(:name).and_return('system')
+        allow(@grgid).to receive(:name).and_return('system')
       end
       it 'should have a root_group of system' do
         @plugin.run
-        @plugin[:root_group].should == 'system'
+        expect(@plugin[:root_group]).to eq('system')
       end
     end
   end
@@ -80,9 +80,9 @@ describe Ohai::System, 'root_group' do
   describe 'windows platform' do
     it 'should return the group administrators' do
       stub_const('::RbConfig::CONFIG', { 'host_os' => 'windows'} )
-      Ohai::Util::Win32::GroupHelper.should_receive(:windows_root_group_name).and_return('administrators')
+      expect(Ohai::Util::Win32::GroupHelper).to receive(:windows_root_group_name).and_return('administrators')
       @plugin.run
-      @plugin[:root_group].should == 'administrators'
+      expect(@plugin[:root_group]).to eq('administrators')
     end
   end
 end

data/spec/unit/plugins/ruby_spec.rb

@@ -53,7 +53,7 @@ describe Ohai::System, "plugin ruby" do
     :ruby_bin => ruby_bin
   }.each do |attribute, value|
     it "should have #{attribute} set" do
-      @ruby_ohai_data[attribute].should eql(value)
+      expect(@ruby_ohai_data[attribute]).to eql(value)
     end
   end
   

data/spec/unit/plugins/sigar/network_route_spec.rb

@@ -34,7 +34,7 @@ describe Ohai::System, "Sigar network route plugin" do
     before(:each) do
       @ohai = Ohai::System.new
       @plugin = get_plugin("sigar/network", @ohai)
-      @plugin.stub(:collect_os).and_return(:sigar)
+      allow(@plugin).to receive(:collect_os).and_return(:sigar)
       @sigar = double("Sigar")
       @net_info_conf={
         :default_gateway => "192.168.1.254",
@@ -45,7 +45,7 @@ describe Ohai::System, "Sigar network route plugin" do
       }
       net_info=double("Sigar::NetInfo")
       @net_info_conf.each_pair do |k,v|
-        net_info.stub(k).and_return(v)
+        allow(net_info).to receive(k).and_return(v)
       end
       @net_route_conf={
         :destination => "192.168.1.0",
@@ -62,7 +62,7 @@ describe Ohai::System, "Sigar network route plugin" do
       }
       net_route=double("Sigar::NetRoute")
       @net_route_conf.each_pair do |k,v|
-        net_route.stub(k).and_return(v)
+        allow(net_route).to receive(k).and_return(v)
       end
       @net_interface_conf={
         :flags => 2115,
@@ -79,7 +79,7 @@ describe Ohai::System, "Sigar network route plugin" do
       }
       net_conf=double("Sigar::NetConf")
       @net_interface_conf.each_pair do |k,v|
-        net_conf.stub(k).and_return(v)
+        allow(net_conf).to receive(k).and_return(v)
       end
       @net_interface_stat={
         :rx_bytes=>1369035618,
@@ -99,7 +99,7 @@ describe Ohai::System, "Sigar network route plugin" do
       }
       net_stat=double("Sigar::NetStat")
       @net_interface_stat.each_pair do |k,v|
-        net_stat.stub(k).and_return(v)
+        allow(net_stat).to receive(k).and_return(v)
       end
       @net_arp_conf={
         :address => "192.168.1.5",
@@ -110,24 +110,24 @@ describe Ohai::System, "Sigar network route plugin" do
       }
       net_arp=double("Sigar::NetArp")
       @net_arp_conf.each_pair do |k,v|
-        net_arp.stub(k).and_return(v)
+        allow(net_arp).to receive(k).and_return(v)
       end
-      @sigar.stub(:fqdn).and_return("localhost.localdomain")
-      @sigar.should_receive(:net_info).once.times.and_return(net_info)
-      @sigar.should_receive(:net_interface_list).once.and_return(["eth0"])
-      @sigar.should_receive(:net_interface_config).with("eth0").and_return(net_conf)
-      @sigar.should_receive(:net_interface_stat).with("eth0").and_return(net_stat)
-      @sigar.should_receive(:arp_list).once.and_return([net_arp])
+      allow(@sigar).to receive(:fqdn).and_return("localhost.localdomain")
+      expect(@sigar).to receive(:net_info).once.times.and_return(net_info)
+      expect(@sigar).to receive(:net_interface_list).once.and_return(["eth0"])
+      expect(@sigar).to receive(:net_interface_config).with("eth0").and_return(net_conf)
+      expect(@sigar).to receive(:net_interface_stat).with("eth0").and_return(net_stat)
+      expect(@sigar).to receive(:arp_list).once.and_return([net_arp])
 
       # Since we double net_route_list here, flags never gets called
-      @sigar.should_receive(:net_route_list).once.and_return([net_route])
-      Sigar.should_receive(:new).once.and_return(@sigar)
+      expect(@sigar).to receive(:net_route_list).once.and_return([net_route])
+      expect(Sigar).to receive(:new).once.and_return(@sigar)
 
       @plugin.run
     end
 
     it "should set the routes" do
-      @plugin[:network][:interfaces][:eth0].should have_key(:route)
+      expect(@plugin[:network][:interfaces][:eth0]).to have_key(:route)
     end
 
     it "should set the route details" do
@@ -137,8 +137,8 @@ describe Ohai::System, "Sigar network route plugin" do
           v="U"
           @plugin[:network][:interfaces][:eth0][:route]["192.168.1.0"][k] = v
         end
-        @plugin[:network][:interfaces][:eth0][:route]["192.168.1.0"].should have_key(k)
-        @plugin[:network][:interfaces][:eth0][:route]["192.168.1.0"][k].should eql(v)
+        expect(@plugin[:network][:interfaces][:eth0][:route]["192.168.1.0"]).to have_key(k)
+        expect(@plugin[:network][:interfaces][:eth0][:route]["192.168.1.0"][k]).to eql(v)
       end
     end
 

data/spec/unit/plugins/solaris2/cpu_spec.rb

@@ -19,9 +19,9 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 describe Ohai::System, "Solaris2.X cpu plugin" do
   before(:each) do
     @plugin = get_plugin("solaris2/cpu")
-    @plugin.stub(:collect_os).and_return("solaris2")
-    @plugin.stub(:shell_out).with("psrinfo | wc -l").and_return(mock_shell_out(0, "32\n", ""))
-    @plugin.stub(:shell_out).with("psrinfo -p").and_return(mock_shell_out(0, "4\n", ""))
+    allow(@plugin).to receive(:collect_os).and_return("solaris2")
+    allow(@plugin).to receive(:shell_out).with("psrinfo | wc -l").and_return(mock_shell_out(0, "32\n", ""))
+    allow(@plugin).to receive(:shell_out).with("psrinfo -p").and_return(mock_shell_out(0, "4\n", ""))
 
     psrinfo_output = <<-END.strip
     x86 (GenuineIntel 206D7 family 6 model 45 step 7 clock 2600 MHz)
@@ -29,54 +29,54 @@ describe Ohai::System, "Solaris2.X cpu plugin" do
     x86 (CrazyTown 206D7 family 12 model 93 step 9 clock 2900 MHz)
       Intel(r) Xeon(r) CPU E5-2690 0 @ 2.90GHz
 END
-    @plugin.stub(:shell_out).with('psrinfo -v -p | grep Hz').and_return(mock_shell_out(0, psrinfo_output, ""))
+    allow(@plugin).to receive(:shell_out).with('psrinfo -v -p | grep Hz').and_return(mock_shell_out(0, psrinfo_output, ""))
   end
   
   it "should get the total virtual processor count" do
     @plugin.run
-    @plugin['cpu']['total'].should eql(32)
+    expect(@plugin['cpu']['total']).to eql(32)
   end
 
   it 'should get the total processor count' do
     @plugin.run
-    @plugin['cpu']['real'].should eql(4)
+    expect(@plugin['cpu']['real']).to eql(4)
   end
 
   describe 'per-cpu information' do
     it "should include vendor_id for processors" do
       @plugin.run
-      @plugin['cpu']['0']['vendor_id'].should eql('GenuineIntel')
-      @plugin['cpu']['1']['vendor_id'].should eql('CrazyTown')
+      expect(@plugin['cpu']['0']['vendor_id']).to eql('GenuineIntel')
+      expect(@plugin['cpu']['1']['vendor_id']).to eql('CrazyTown')
     end
 
     it "should include family for processors" do
       @plugin.run
-      @plugin['cpu']["0"]["family"].should eql("6")
-      @plugin['cpu']["1"]["family"].should eql("12")
+      expect(@plugin['cpu']["0"]["family"]).to eql("6")
+      expect(@plugin['cpu']["1"]["family"]).to eql("12")
     end
 
     it "should include model for processors" do
       @plugin.run
-      @plugin['cpu']["0"]["model"].should eql("45")
-      @plugin['cpu']["1"]["model"].should eql("93")
+      expect(@plugin['cpu']["0"]["model"]).to eql("45")
+      expect(@plugin['cpu']["1"]["model"]).to eql("93")
     end
 
     it "should include stepping for processors" do
       @plugin.run
-      @plugin['cpu']["0"]["stepping"].should eql("7")
-      @plugin['cpu']["1"]["stepping"].should eql("9")
+      expect(@plugin['cpu']["0"]["stepping"]).to eql("7")
+      expect(@plugin['cpu']["1"]["stepping"]).to eql("9")
     end
 
     it "should include model name for processors" do
       @plugin.run
-      @plugin['cpu']["0"]["model_name"].should eql("Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz")
-      @plugin['cpu']["1"]["model_name"].should eql("Intel(r) Xeon(r) CPU E5-2690 0 @ 2.90GHz")
+      expect(@plugin['cpu']["0"]["model_name"]).to eql("Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz")
+      expect(@plugin['cpu']["1"]["model_name"]).to eql("Intel(r) Xeon(r) CPU E5-2690 0 @ 2.90GHz")
     end
 
     it "should include mhz name for processors" do
       @plugin.run
-      @plugin['cpu']["0"]["mhz"].should eql("2600")
-      @plugin['cpu']["1"]["mhz"].should eql("2900")
+      expect(@plugin['cpu']["0"]["mhz"]).to eql("2600")
+      expect(@plugin['cpu']["1"]["mhz"]).to eql("2900")
     end
   end
 end