ohai 6.24.2 → 7.0.0.rc.0

data/spec/unit/plugins/passwd_spec.rb

@@ -2,8 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 describe Ohai::System, "plugin etc" do
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai.stub!(:require_plugin).and_return(true)
+    @plugin = get_plugin("passwd")
   end
 
   PasswdEntry = Struct.new(:name, :uid, :gid, :dir, :shell, :gecos)
@@ -12,31 +11,31 @@ describe Ohai::System, "plugin etc" do
   it "should include a list of all users" do
     Etc.should_receive(:passwd).and_yield(PasswdEntry.new("root", 1, 1, '/root', '/bin/zsh', 'BOFH')).
       and_yield(PasswdEntry.new('www', 800, 800, '/var/www', '/bin/false', 'Serving the web since 1970'))
-    @ohai._require_plugin("passwd")
-    @ohai[:etc][:passwd]['root'].should == Mash.new(:shell => '/bin/zsh', :gecos => 'BOFH', :gid => 1, :uid => 1, :dir => '/root')
-    @ohai[:etc][:passwd]['www'].should == Mash.new(:shell => '/bin/false', :gecos => 'Serving the web since 1970', :gid => 800, :uid => 800, :dir => '/var/www')
+    @plugin.run
+    @plugin[:etc][:passwd]['root'].should == Mash.new(:shell => '/bin/zsh', :gecos => 'BOFH', :gid => 1, :uid => 1, :dir => '/root')
+    @plugin[:etc][:passwd]['www'].should == Mash.new(:shell => '/bin/false', :gecos => 'Serving the web since 1970', :gid => 800, :uid => 800, :dir => '/var/www')
   end
 
   it "should set the current user" do
     Etc.should_receive(:getlogin).and_return('chef')
-    @ohai._require_plugin("passwd")
-    @ohai[:current_user].should == 'chef'
+    @plugin.run
+    @plugin[:current_user].should == 'chef'
   end
 
   it "should set the available groups" do
     Etc.should_receive(:group).and_yield(GroupEntry.new("admin", 100, ['root', 'chef'])).and_yield(GroupEntry.new('www', 800, ['www', 'deploy']))
-    @ohai._require_plugin("passwd")
-    @ohai[:etc][:group]['admin'].should == Mash.new(:gid => 100, :members => ['root', 'chef'])
-    @ohai[:etc][:group]['www'].should == Mash.new(:gid => 800, :members => ['www', 'deploy'])
+    @plugin.run
+    @plugin[:etc][:group]['admin'].should == Mash.new(:gid => 100, :members => ['root', 'chef'])
+    @plugin[:etc][:group]['www'].should == Mash.new(:gid => 800, :members => ['www', 'deploy'])
   end
 
   if "".respond_to?(:force_encoding)
     it "sets the encoding of strings to the default external encoding" do
       fields = ["root", 1, 1, '/root', '/bin/zsh', 'BOFH']
       fields.each {|f| f.force_encoding(Encoding::ASCII_8BIT) if f.respond_to?(:force_encoding) }
-      Etc.stub!(:passwd).and_yield(PasswdEntry.new(*fields))
-      @ohai._require_plugin("passwd")
-      root = @ohai[:etc][:passwd]['root']
+      Etc.stub(:passwd).and_yield(PasswdEntry.new(*fields))
+      @plugin.run
+      root = @plugin[:etc][:passwd]['root']
       root['gecos'].encoding.should == Encoding.default_external
     end
   end

data/spec/unit/plugins/perl_spec.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Joshua Timberman(<joshua@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Theodore Nordsieck (<theo@opscode.com>)
+# Copyright:: Copyright (c) 2009-2013 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,63 +21,38 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 describe Ohai::System, "plugin perl" do
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai[:languages] = Mash.new
-    @ohai.stub!(:require_plugin).and_return(true)
-    @pid = 2342
-    @stderr = StringIO.new
-    @stdout = StringIO.new(<<-OUT)
-version='5.8.8';
-archname='darwin-thread-multi-2level';
-OUT
-    @stdin = StringIO.new
-    @status = 0
-    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"perl -V:version -V:archname"}).and_return([
-      @status,
-      @stdout,
-      @stderr
-    ])
+    @plugin = get_plugin("perl")
+    @plugin[:languages] = Mash.new
+    @stdout = "version='5.8.8';#{$/}archname='darwin-thread-multi-2level';"
+    @plugin.stub(:shell_out).with("perl -V:version -V:archname").and_return(mock_shell_out(0, @stdout, ""))
   end
 
   it "should run perl -V:version -V:archname" do
-    @ohai.should_receive(:run_command).with({:no_status_check=>true, :command=>"perl -V:version -V:archname"}).and_return(true)
-    @ohai._require_plugin("perl")
-  end
-
-  it "should iterate over each line of perl command's stdout" do
-    @stdout.should_receive(:each_line).and_return(true)
-    @ohai._require_plugin("perl")
+    @plugin.should_receive(:shell_out).with("perl -V:version -V:archname").and_return(mock_shell_out(0, @stdout, ""))
+    @plugin.run
   end
 
   it "should set languages[:perl][:version]" do
-    @ohai._require_plugin("perl")
-    @ohai.languages[:perl][:version].should eql("5.8.8")
+    @plugin.run
+    @plugin.languages[:perl][:version].should eql("5.8.8")
   end
 
   it "should set languages[:perl][:archname]" do
-    @ohai._require_plugin("perl")
-    @ohai.languages[:perl][:archname].should eql("darwin-thread-multi-2level")
+    @plugin.run
+    @plugin.languages[:perl][:archname].should eql("darwin-thread-multi-2level")
   end
 
   it "should set languages[:perl] if perl command succeeds" do
-    @status = 0
-    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"perl -V:version -V:archname"}).and_return([
-      @status,
-      @stdout,
-      @stderr
-    ])
-    @ohai._require_plugin("perl")
-    @ohai.languages.should have_key(:perl)
+    @plugin.stub(:shell_out).with("perl -V:version -V:archname").and_return(mock_shell_out(0, @stdout, ""))
+    @plugin.run
+    @plugin.languages.should have_key(:perl)
   end
 
   it "should not set languages[:perl] if perl command fails" do
-     @status = 1
-    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"perl -V:version -V:archname"}).and_return([
-      @status,
-      @stdout,
-      @stderr
-     ])
-     @ohai._require_plugin("perl")
-     @ohai.languages.should_not have_key(:perl)
+    @status = 1
+    @plugin.stub(:shell_out).with("perl -V:version -V:archname").and_return(mock_shell_out(1, @stdout, ""))
+    @plugin.run
+    @plugin.languages.should_not have_key(:perl)
   end
+
 end

data/spec/unit/plugins/php_spec.rb

@@ -1,6 +1,8 @@
 #
 # Author:: Doug MacEachern <dougm@vmware.com>
+# Author:: Theodore Nordsieck (<theo@opscode.com>)
 # Copyright:: Copyright (c) 2009 VMware, Inc.
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,37 +18,40 @@
 # limitations under the License.
 #
 
+require 'json'
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb'))
 
 describe Ohai::System, "plugin php" do
 
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai[:languages] = Mash.new
-    @ohai.stub!(:require_plugin).and_return(true)
-    @status = 0
+    @plugin = get_plugin("php")
+    @plugin[:languages] = Mash.new
     @stdout = "PHP 5.1.6 (cli) (built: Jul 16 2008 19:52:52)\nCopyright (c) 1997-2006 The PHP Group\nZend Engine v2.1.0, Copyright (c) 1998-2006 Zend Technologies\n"
-    @stderr = ""
-    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"php -v"}).and_return([@status, @stdout, @stderr])
+    @plugin.stub(:shell_out).with("php -v").and_return(mock_shell_out(0, @stdout, ""))
   end
 
   it "should get the php version from running php -V" do
-    @ohai.should_receive(:run_command).with({:no_status_check=>true, :command=>"php -v"}).and_return([0, "PHP 5.1.6 (cli) (built: Jul 16 2008 19:52:52)\nCopyright (c) 1997-2006 The PHP Group\nZend Engine v2.1.0, Copyright (c) 1998-2006 Zend Technologies\n", ""])
-    @ohai._require_plugin("php")
+    @plugin.should_receive(:shell_out).with("php -v").and_return(mock_shell_out(0, @stdout, ""))
+    @plugin.run
   end
 
   it "should set languages[:php][:version]" do
-    @ohai._require_plugin("php")
-    @ohai.languages[:php][:version].should eql("5.1.6")
+    @plugin.run
+    @plugin.languages[:php][:version].should eql("5.1.6")
   end
 
   it "should not set the languages[:php] tree up if php command fails" do
-    @status = 1
     @stdout = "PHP 5.1.6 (cli) (built: Jul 16 2008 19:52:52)\nCopyright (c) 1997-2006 The PHP Group\nZend Engine v2.1.0, Copyright (c) 1998-2006 Zend Technologies\n"
-    @stderr = ""
-    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"php -v"}).and_return([@status, @stdout, @stderr])
-    @ohai._require_plugin("php")
-    @ohai.languages.should_not have_key(:php)
+    @plugin.stub(:shell_out).with("php -v").and_return(mock_shell_out(1, @stdout, ""))
+    @plugin.run
+    @plugin.languages.should_not have_key(:php)
+  end
+
+  it "should parse builddate even if it's suhosin patched" do
+    @stdout = "PHP 5.3.27 with Suhosin-Patch (cli) (built: Aug 30 2013 04:30:30) \nCopyright (c) 1997-2013 The PHP Group\nZend Engine v2.3.0, Copyright (c) 1998-2013 Zend Technologies"
+    @plugin.stub(:shell_out).with("php -v").and_return(mock_shell_out(0, @stdout, ""))
+    @plugin.run
+    @plugin.languages[:php][:builddate].should eql("Aug 30 2013 04:30:30")
   end
 
 end

data/spec/unit/plugins/platform_spec.rb

@@ -21,51 +21,46 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 describe Ohai::System, "plugin platform" do
   before(:each) do
-    @ohai = Ohai::System.new    
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai[:os] = 'monkey'
-    @ohai[:os_version] = 'poop'
+    @plugin = get_plugin("platform")
+    @plugin.stub(:collect_os).and_return(:default)
+    @plugin[:os] = 'monkey'
+    @plugin[:os_version] = 'poop'
   end
-  
-  it "should require the os platform plugin" do
-    @ohai.should_receive(:require_plugin).with("monkey::platform")
-    @ohai._require_plugin("platform")
-  end
-  
+
   it "should set the platform and platform family to the os if it was not set earlier" do
-    @ohai._require_plugin("platform")
-    @ohai[:platform].should eql("monkey")
-    @ohai[:platform_family].should eql("monkey")
+    @plugin.run
+    @plugin[:platform].should eql("monkey")
+    @plugin[:platform_family].should eql("monkey")
   end
   
   it "should not set the platform to the os if it was set earlier" do
-    @ohai[:platform] = 'lars'
-    @ohai._require_plugin("platform")
-    @ohai[:platform].should eql("lars")
+    @plugin[:platform] = 'lars'
+    @plugin.run
+    @plugin[:platform].should eql("lars")
   end
   
   it "should set the platform_family to the platform if platform was set earlier but not platform_family" do
-    @ohai[:platform] = 'lars'
-    @ohai[:platform_family] = 'jack'
-    @ohai._require_plugin("platform")
-    @ohai[:platform_family].should eql("jack")
+    @plugin[:platform] = 'lars'
+    @plugin[:platform_family] = 'jack'
+    @plugin.run
+    @plugin[:platform_family].should eql("jack")
   end
  
   it "should not set the platform_family if the platform_family was set earlier." do
-    @ohai[:platform] = 'lars'
-    @ohai._require_plugin("platform")
-    @ohai[:platform].should eql("lars")
-    @ohai[:platform_family].should eql("lars")
+    @plugin[:platform] = 'lars'
+    @plugin.run
+    @plugin[:platform].should eql("lars")
+    @plugin[:platform_family].should eql("lars")
   end
 
   it "should set the platform_version to the os_version if it was not set earlier" do
-    @ohai._require_plugin("platform")
-    @ohai[:os_version].should eql("poop")
+    @plugin.run
+    @plugin[:os_version].should eql("poop")
   end
   
   it "should not set the platform to the os if it was set earlier" do
-    @ohai[:platform_version] = 'ulrich'
-    @ohai._require_plugin("platform")
-    @ohai[:platform_version].should eql("ulrich")
+    @plugin[:platform_version] = 'ulrich'
+    @plugin.run
+    @plugin[:platform_version].should eql("ulrich")
   end
 end

data/spec/unit/plugins/python_spec.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Theodore Nordsieck (<theo@opscode.com>)
+# Copyright:: Copyright (c) 2008-2013 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,32 +23,27 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 describe Ohai::System, "plugin python" do
 
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai[:languages] = Mash.new    
-    @ohai.stub!(:require_plugin).and_return(true)
-    @status = 0
+    @plugin = get_plugin("python")
+    @plugin[:languages] = Mash.new
     @stdout = "2.5.2 (r252:60911, Jan  4 2009, 17:40:26)\n[GCC 4.3.2]\n"
-    @stderr = ""
-    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"python -c \"import sys; print sys.version\""}).and_return([@status, @stdout, @stderr])
+    @plugin.stub(:shell_out).with("python -c \"import sys; print sys.version\"").and_return(mock_shell_out(0, @stdout, ""))
   end
   
   it "should get the python version from printing sys.version and sys.platform" do
-    @ohai.should_receive(:run_command).with({:no_status_check=>true, :command=>"python -c \"import sys; print sys.version\""}).and_return([0, "2.5.2 (r252:60911, Jan  4 2009, 17:40:26)\n[GCC 4.3.2]\n", ""])
-    @ohai._require_plugin("python")
+    @plugin.should_receive(:shell_out).with("python -c \"import sys; print sys.version\"").and_return(mock_shell_out(0, @stdout, ""))
+    @plugin.run
   end
 
   it "should set languages[:python][:version]" do
-    @ohai._require_plugin("python")
-    @ohai.languages[:python][:version].should eql("2.5.2")
+    @plugin.run
+    @plugin.languages[:python][:version].should eql("2.5.2")
   end
   
   it "should not set the languages[:python] tree up if python command fails" do
-    @status = 1
     @stdout = "2.5.2 (r252:60911, Jan  4 2009, 17:40:26)\n[GCC 4.3.2]\n"
-    @stderr = ""
-    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"python -c \"import sys; print sys.version\""}).and_return([@status, @stdout, @stderr])
-    @ohai._require_plugin("python")
-    @ohai.languages.should_not have_key(:python)
+    @plugin.stub(:shell_out).with("python -c \"import sys; print sys.version\"").and_return(mock_shell_out(1, @stdout, ""))
+    @plugin.run
+    @plugin.languages.should_not have_key(:python)
   end
-  
+
 end

data/spec/unit/plugins/rackspace_spec.rb

@@ -19,9 +19,9 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 describe Ohai::System, "plugin rackspace" do
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai[:network] = {:interfaces => {:eth0 => {"addresses"=> {
+    @plugin = get_plugin("rackspace")
+    @plugin[:hostname] = "katie"
+    @plugin[:network] = {:interfaces => {:eth0 => {"addresses"=> {
       "1.2.3.4"=> {
         "broadcast"=> "67.23.20.255",
         "netmask"=> "255.255.255.0",
@@ -40,64 +40,70 @@ describe Ohai::System, "plugin rackspace" do
       "40:40:95:47:6E:ED"=> {
         "family"=> "lladdr"
       }
-    }}}}
-
-    @ohai[:network][:interfaces][:eth1] = {:addresses => {
-      "fe80::4240:f5ff:feab:2836" => {
-        "scope"=> "Link",
-        "prefixlen"=> "64",
-        "family"=> "inet6"
-      },
-      "5.6.7.8"=> {
-        "broadcast"=> "10.176.191.255",
-        "netmask"=> "255.255.224.0",
-        "family"=> "inet"
-      },
-      "40:40:F5:AB:28:36" => {
-        "family"=> "lladdr"
-      }
+      }}
+    }
+  }
+
+  @plugin[:network][:interfaces][:eth1] = {:addresses => {
+    "fe80::4240:f5ff:feab:2836" => {
+      "scope"=> "Link",
+      "prefixlen"=> "64",
+      "family"=> "inet6"
+    },
+    "5.6.7.8"=> {
+      "broadcast"=> "10.176.191.255",
+      "netmask"=> "255.255.224.0",
+      "family"=> "inet"
+    },
+    "40:40:F5:AB:28:36" => {
+      "family"=> "lladdr"
+    }
     }}
 
     # In olden days we could detect rackspace by a -rscloud suffix on the kernel
     # This is here to make #has_rackspace_kernel? fail until we remove that check
-    @ohai[:kernel] = { :release => "1.2.13-not-rackspace" }
+    @plugin[:kernel] = { :release => "1.2.13-not-rackspace" }
 
     # We need a generic stub here for the later stubs with arguments to work
     # Because, magic.
-    @ohai.stub(:run_command).and_return(false)
+    @plugin.stub(:shell_out).and_return(mock_shell_out(1, "", ""))
   end
 
   shared_examples_for "!rackspace"  do
     it "should NOT create rackspace" do
-      @ohai._require_plugin("rackspace")
-      @ohai[:rackspace].should be_nil
+      @plugin.run
+      @plugin[:rackspace].should be_nil
     end
   end
 
   shared_examples_for "rackspace" do
 
     it "should create rackspace" do
-      @ohai._require_plugin("rackspace")
-      @ohai[:rackspace].should_not be_nil
+      @plugin.run
+      @plugin[:rackspace].should_not be_nil
     end
 
     it "should have all required attributes" do
-      @ohai._require_plugin("rackspace")
-      @ohai[:rackspace][:public_ip].should_not be_nil
-      @ohai[:rackspace][:private_ip].should_not be_nil
-      @ohai[:rackspace][:public_ipv4].should_not be_nil
-      @ohai[:rackspace][:local_ipv4].should_not be_nil
-      @ohai[:rackspace][:public_ipv6].should_not be_nil
-      @ohai[:rackspace][:local_ipv6].should be_nil
+      @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
     end
 
     it "should have correct values for all attributes" do
-      @ohai._require_plugin("rackspace")
-      @ohai[:rackspace][:public_ip].should == "1.2.3.4"
-      @ohai[:rackspace][:private_ip].should == "5.6.7.8"
-      @ohai[:rackspace][:public_ipv4].should == "1.2.3.4"
-      @ohai[:rackspace][:local_ipv4].should == "5.6.7.8"
-      @ohai[:rackspace][:public_ipv6].should == "2a00:1a48:7805:111:e875:efaf:ff08:75"
+      @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.static.cloud-ips.com"
     end
 
     it "should capture region information" do
@@ -108,9 +114,9 @@ server_id = "21301000"
 created_at = "2012-12-06T22:08:16Z"
 region = "dfw"
 OUT
-      @ohai.stub(:run_command).with({:no_status_check=>true, :command=>"xenstore-ls vm-data/provider_data"}).and_return([ 0, provider_data, ""])
-      @ohai._require_plugin("rackspace")
-      @ohai[:rackspace][:region].should == "dfw"
+      @plugin.stub(:shell_out).with("xenstore-ls vm-data/provider_data").and_return(mock_shell_out(0, provider_data, ""))
+      @plugin.run
+      @plugin[:rackspace][:region].should == "dfw"
     end
   end
 
@@ -118,10 +124,38 @@ OUT
     it_should_behave_like "rackspace"
 
     before(:each) do
-      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/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('')
+    end
+
+    describe 'with no public interfaces (empty eth0)' do
+      before do
+        # unset public (eth0) addresses
+        @plugin[:network][:interfaces][:eth0]['addresses'] = {} 
+      end
+
+      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
+        # 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
+      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'
+      end
     end
   end
 
@@ -129,8 +163,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)
+      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)
     end
   end
   
@@ -138,10 +172,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('')
+      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('')
+
+      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)
     end
   end
 
@@ -149,10 +186,8 @@ OUT
     it_should_behave_like "rackspace"
 
     before(:each) do
-      stderr = StringIO.new
       stdout = "Rackspace\n"
-      status = 0
-      @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"xenstore-read vm-data/provider_data/provider"}).and_return([ status, stdout, stderr ])
+      @plugin.stub(:shell_out).with("xenstore-read vm-data/provider_data/provider").and_return(mock_shell_out(0, stdout, "" ))
     end
   end
 
@@ -160,10 +195,8 @@ OUT
     it_should_behave_like "!rackspace"
 
     before(:each) do
-      stderr = StringIO.new
       stdout = "cumulonimbus\n"
-      status = 0
-      @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"xenstore-read vm-data/provider_data/provider"}).and_return([ status, stdout, stderr ])
+      @plugin.stub(:shell_out).with("xenstore-read vm-data/provider_data/provider").and_return(mock_shell_out(0, stdout, "" ))
     end
   end
 end