ohai 6.24.2 → 7.0.0.rc.0

data/spec/unit/plugins/linux/uptime_spec.rb

@@ -21,41 +21,29 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "Linux plugin uptime" do
   before(:each) do
-    @ohai = Ohai::System.new    
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai[:os] = "linux"
-    @ohai._require_plugin("uptime")
-    @mock_file = mock("/proc/uptime", { :gets => "18423 989" })
-    File.stub!(:open).with("/proc/uptime").and_return(@mock_file)
+    @plugin = get_plugin("uptime")
+    @plugin.stub(:collect_os).and_return(:linux)
+    @double_file = double("/proc/uptime", { :gets => "18423 989" })
+    File.stub(:open).with("/proc/uptime").and_return(@double_file)
   end
  
-  it "should check /proc/uptime for the uptime and idletime" do
-    File.should_receive(:open).with("/proc/uptime").and_return(@mock_file)
-    @ohai._require_plugin("linux::uptime")
-  end
-  
-  it "should split the value of /proc uptime" do
-    @mock_file.gets.should_receive(:split).with(" ").and_return(["18423", "989"])
-    @ohai._require_plugin("linux::uptime")
-  end
-  
   it "should set uptime_seconds to uptime" do
-    @ohai._require_plugin("linux::uptime")
-    @ohai[:uptime_seconds].should == 18423
+    @plugin.run
+    @plugin[:uptime_seconds].should == 18423
   end
   
   it "should set uptime to a human readable date" do
-    @ohai._require_plugin("linux::uptime")
-    @ohai[:uptime].should == "5 hours 07 minutes 03 seconds"
+    @plugin.run
+    @plugin[:uptime].should == "5 hours 07 minutes 03 seconds"
   end
   
   it "should set idletime_seconds to uptime" do
-    @ohai._require_plugin("linux::uptime")
-    @ohai[:idletime_seconds].should == 989
+    @plugin.run
+    @plugin[:idletime_seconds].should == 989
   end
   
   it "should set idletime to a human readable date" do
-    @ohai._require_plugin("linux::uptime")
-    @ohai[:idletime].should == "16 minutes 29 seconds"
+    @plugin.run
+    @plugin[:idletime].should == "16 minutes 29 seconds"
   end
-end
+end

data/spec/unit/plugins/linux/virtualization_spec.rb

@@ -20,230 +20,250 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "Linux virtualization platform" do
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai[:os] = "linux"
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai.extend(SimpleFromFile)
+    @plugin = get_plugin("linux/virtualization")
+    @plugin.stub(:collect_os).and_return(:linux)
 
     # default to all requested Files not existing
-    File.stub!(:exists?).with("/proc/xen").and_return(false)
-    File.stub!(:exists?).with("/proc/xen/capabilities").and_return(false)
-    File.stub!(:exists?).with("/proc/modules").and_return(false)
-    File.stub!(:exists?).with("/proc/cpuinfo").and_return(false)
-    File.stub!(:exists?).with("/usr/sbin/dmidecode").and_return(false)
-    File.stub!(:exists?).with("/proc/self/status").and_return(false)
-    File.stub!(:exists?).with("/proc/bc/0").and_return(false)
-    File.stub!(:exists?).with("/proc/vz").and_return(false)
+    File.stub(:exists?).with("/proc/xen").and_return(false)
+    File.stub(:exists?).with("/proc/xen/capabilities").and_return(false)
+    File.stub(:exists?).with("/proc/modules").and_return(false)
+    File.stub(:exists?).with("/proc/cpuinfo").and_return(false)
+    File.stub(:exists?).with("/usr/sbin/dmidecode").and_return(false)
+    File.stub(:exists?).with("/proc/self/status").and_return(false)
+    File.stub(:exists?).with("/proc/bc/0").and_return(false)
+    File.stub(:exists?).with("/proc/vz").and_return(false)
   end
 
   describe "when we are checking for xen" do
     it "should set xen guest if /proc/xen exists but /proc/xen/capabilities does not" do
       File.should_receive(:exists?).with("/proc/xen").and_return(true)
       File.should_receive(:exists?).with("/proc/xen/capabilities").and_return(false)
-      @ohai._require_plugin("linux::virtualization")
-      @ohai[:virtualization][:system].should == "xen"
-      @ohai[:virtualization][:role].should == "guest"
+      @plugin.run
+      @plugin[:virtualization][:system].should == "xen"
+      @plugin[:virtualization][:role].should == "guest"
     end
 
     it "should set xen host if /proc/xen/capabilities contains control_d " do
       File.should_receive(:exists?).with("/proc/xen").and_return(true)
       File.should_receive(:exists?).with("/proc/xen/capabilities").and_return(true)
-      File.stub!(:read).with("/proc/xen/capabilities").and_return("control_d")
-      @ohai._require_plugin("linux::virtualization")
-      @ohai[:virtualization][:system].should == "xen"
-      @ohai[:virtualization][:role].should == "host"
+      File.stub(:read).with("/proc/xen/capabilities").and_return("control_d")
+      @plugin.run
+      @plugin[:virtualization][:system].should == "xen"
+      @plugin[:virtualization][:role].should == "host"
     end
 
     it "should set xen guest if /proc/xen/capabilities exists but is empty" do
       File.should_receive(:exists?).with("/proc/xen").and_return(true)
       File.should_receive(:exists?).with("/proc/xen/capabilities").and_return(true)
-      File.stub!(:read).with("/proc/xen/capabilities").and_return("")
-      @ohai._require_plugin("linux::virtualization")
-      @ohai[:virtualization][:system].should == "xen"
-      @ohai[:virtualization][:role].should == "guest"
+      File.stub(:read).with("/proc/xen/capabilities").and_return("")
+      @plugin.run
+      @plugin[:virtualization][:system].should == "xen"
+      @plugin[:virtualization][:role].should == "guest"
     end
 
     it "should not set virtualization if xen isn't there" do
       File.should_receive(:exists?).at_least(:once).and_return(false)
-      @ohai._require_plugin("linux::virtualization")
-      @ohai[:virtualization].should == {}
+      @plugin.run
+      @plugin[:virtualization].should == {}
     end
   end
 
   describe "when we are checking for kvm" do
     it "should set kvm host if /proc/modules contains kvm" do
       File.should_receive(:exists?).with("/proc/modules").and_return(true)
-      File.stub!(:read).with("/proc/modules").and_return("kvm 165872  1 kvm_intel")
-      @ohai._require_plugin("linux::virtualization")
-      @ohai[:virtualization][:system].should == "kvm"
-      @ohai[:virtualization][:role].should == "host"
+      File.stub(:read).with("/proc/modules").and_return("kvm 165872  1 kvm_intel")
+      @plugin.run
+      @plugin[:virtualization][:system].should == "kvm"
+      @plugin[:virtualization][:role].should == "host"
     end
 
     it "should set kvm guest if /proc/cpuinfo contains QEMU Virtual CPU" do
       File.should_receive(:exists?).with("/proc/cpuinfo").and_return(true)
-      File.stub!(:read).with("/proc/cpuinfo").and_return("QEMU Virtual CPU")
-      @ohai._require_plugin("linux::virtualization")
-      @ohai[:virtualization][:system].should == "kvm"
-      @ohai[:virtualization][:role].should == "guest"
+      File.stub(:read).with("/proc/cpuinfo").and_return("QEMU Virtual CPU")
+      @plugin.run
+      @plugin[:virtualization][:system].should == "kvm"
+      @plugin[:virtualization][:role].should == "guest"
+    end
+
+    it "should set kvm guest if /proc/cpuinfo contains Common KVM processor" do
+      File.should_receive(:exists?).with("/proc/cpuinfo").and_return(true)
+      File.stub(:read).with("/proc/cpuinfo").and_return("Common KVM processor")
+      @plugin.run
+      @plugin[:virtualization][:system].should == "kvm"
+      @plugin[:virtualization][:role].should == "guest"
+    end
+
+    it "should set kvm guest if /proc/cpuinfo contains Common 32-bit KVM processor" do
+      File.should_receive(:exists?).with("/proc/cpuinfo").and_return(true)
+      File.stub(:read).with("/proc/cpuinfo").and_return("Common 32-bit KVM processor")
+      @plugin.run
+      @plugin[:virtualization][:system].should == "kvm"
+      @plugin[:virtualization][:role].should == "guest"
     end
 
     it "should not set virtualization if kvm isn't there" do
       File.should_receive(:exists?).at_least(:once).and_return(false)
-      @ohai._require_plugin("linux::virtualization")
-      @ohai[:virtualization].should == {}
+      @plugin.run
+      @plugin[:virtualization].should == {}
     end
   end
 
   describe "when we are checking for VirtualBox" do
     it "should set vbox host if /proc/modules contains vboxdrv" do
       File.should_receive(:exists?).with("/proc/modules").and_return(true)
-      File.stub!(:read).with("/proc/modules").and_return("vboxdrv 268268 3 vboxnetadp,vboxnetflt")
-      @ohai._require_plugin("linux::virtualization")
-      @ohai[:virtualization][:system].should == "vbox"
-      @ohai[:virtualization][:role].should == "host"
+      File.stub(:read).with("/proc/modules").and_return("vboxdrv 268268 3 vboxnetadp,vboxnetflt")
+      @plugin.run
+      @plugin[:virtualization][:system].should == "vbox"
+      @plugin[:virtualization][:role].should == "host"
     end
 
-    it "should set vbox guest if /proc/modules contains vboxguest" do
+    it "should set vbox gues if /proc/modules contains vboxguest" do
       File.should_receive(:exists?).with("/proc/modules").and_return(true)
-      File.stub!(:read).with("/proc/modules").and_return("vboxguest 177749 2 vboxsf")
-      @ohai._require_plugin("linux::virtualization")
-      @ohai[:virtualization][:system].should == "vbox"
-      @ohai[:virtualization][:role].should == "guest"
+      File.stub(:read).with("/proc/modules").and_return("vboxguest 214901 2 vboxsf, Live 0xffffffffa00db000 (OF)")
+      @plugin.run
+      @plugin[:virtualization][:system].should == "vbox"
+      @plugin[:virtualization][:role].should == "guest"
     end
 
     it "should not set virtualization if vbox isn't there" do
       File.should_receive(:exists?).at_least(:once).and_return(false)
-      @ohai._require_plugin("linux::virtualization")
-      @ohai[:virtualization].should == {}
+      @plugin.run
+      @plugin[:virtualization].should == {}
     end
   end
 
   describe "when we are parsing dmidecode" do
     before(:each) do
       File.should_receive(:exists?).with("/usr/sbin/dmidecode").and_return(true)
-      @stdin = mock("STDIN", { :close => true })
-      @pid = 10
-      @stderr = mock("STDERR")
-      @stdout = mock("STDOUT")
-      @status = 0
-    end
-
-    it "should run dmidecode" do
-      @ohai.should_receive(:popen4).with("dmidecode").and_return(true)
-      @ohai._require_plugin("linux::virtualization")
     end
 
     it "should set virtualpc guest if dmidecode detects Microsoft Virtual Machine" do
       ms_vpc_dmidecode=<<-MSVPC
 System Information
-	Manufacturer: Microsoft Corporation
-	Product Name: Virtual Machine
-	Version: VS2005R2
-	Serial Number: 1688-7189-5337-7903-2297-1012-52
-	UUID: D29974A4-BE51-044C-BDC6-EFBC4B87A8E9
-	Wake-up Type: Power Switch
+  Manufacturer: Microsoft Corporation
+  Product Name: Virtual Machine
+  Version: VS2005R2
+  Serial Number: 1688-7189-5337-7903-2297-1012-52
+  UUID: D29974A4-BE51-044C-BDC6-EFBC4B87A8E9
+  Wake-up Type: Power Switch
 MSVPC
-      @stdout.stub!(:read).and_return(ms_vpc_dmidecode)
-
-      @ohai.stub!(:popen4).with("dmidecode").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
-      @ohai._require_plugin("linux::virtualization")
-      @ohai[:virtualization][:system].should == "virtualpc"
-      @ohai[:virtualization][:role].should == "guest"
+      @plugin.stub(:shell_out).with("dmidecode").and_return(mock_shell_out(0, ms_vpc_dmidecode, ""))
+      @plugin.run
+      @plugin[:virtualization][:system].should == "virtualpc"
+      @plugin[:virtualization][:role].should == "guest"
     end
 
     it "should set vmware guest if dmidecode detects VMware Virtual Platform" do
       vmware_dmidecode=<<-VMWARE
 System Information
-	Manufacturer: VMware, Inc.
-	Product Name: 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 Type: Power Switch
-	SKU Number: Not Specified
-	Family: Not Specified
+  Manufacturer: VMware, Inc.
+  Product Name: 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 Type: Power Switch
+  SKU Number: Not Specified
+  Family: Not Specified
 VMWARE
-      @stdout.stub!(:read).and_return(vmware_dmidecode)
-      @ohai.stub!(:popen4).with("dmidecode").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
-      @ohai._require_plugin("linux::virtualization")
-      @ohai[:virtualization][:system].should == "vmware"
-      @ohai[:virtualization][:role].should == "guest"
+      @plugin.stub(:shell_out).with("dmidecode").and_return(mock_shell_out(0, vmware_dmidecode, ""))
+      @plugin.run
+      @plugin[:virtualization][:system].should == "vmware"
+      @plugin[:virtualization][:role].should == "guest"
+    end
+
+    it "should set vbox guest if dmidecode detects Oracle Corporation" do
+      vbox_dmidecode=<<-VBOX
+Base Board Information
+  Manufacturer: Oracle Corporation
+  Product Name: VirtualBox
+  Version: 1.2
+  Serial Number: 0
+  Asset Tag: Not Specified
+  Features:
+        Board is a hosting board
+  Location In Chasis: Not Specified
+  Type: Motherboard
+  Contained Object Handles: 0
+VBOX
+      @plugin.stub(:shell_out).with("dmidecode").and_return(mock_shell_out(0, vbox_dmidecode, ""))
+      @plugin.run
+      @plugin[:virtualization][:system].should == "vbox"
+      @plugin[:virtualization][:role].should == "guest"
     end
 
     it "should run dmidecode and not set virtualization if nothing is detected" do
-      @ohai.should_receive(:popen4).with("dmidecode").and_return(true)
-      @ohai._require_plugin("linux::virtualization")
-      @ohai[:virtualization].should == {}
+      @plugin.stub(:shell_out).with("dmidecode").and_return(mock_shell_out(0, "", ""))
+      @plugin.run
+      @plugin[:virtualization].should == {}
     end
   end
 
   describe "when we are checking for Linux-VServer" do
     it "should set Linux-VServer host if /proc/self/status contains s_context: 0" do
       File.should_receive(:exists?).with("/proc/self/status").and_return(true)
-      File.stub!(:read).with("/proc/self/status").and_return("s_context: 0")
-      @ohai._require_plugin("linux::virtualization")
-      @ohai[:virtualization][:system].should == "linux-vserver"
-      @ohai[:virtualization][:role].should == "host"
+      File.stub(:read).with("/proc/self/status").and_return("s_context: 0")
+      @plugin.run
+      @plugin[:virtualization][:system].should == "linux-vserver"
+      @plugin[:virtualization][:role].should == "host"
     end
 
     it "should set Linux-VServer host if /proc/self/status contains VxID: 0" do
       File.should_receive(:exists?).with("/proc/self/status").and_return(true)
-      File.stub!(:read).with("/proc/self/status").and_return("VxID: 0")
-      @ohai._require_plugin("linux::virtualization")
-      @ohai[:virtualization][:system].should == "linux-vserver"
-      @ohai[:virtualization][:role].should == "host"
+      File.stub(:read).with("/proc/self/status").and_return("VxID: 0")
+      @plugin.run
+      @plugin[:virtualization][:system].should == "linux-vserver"
+      @plugin[:virtualization][:role].should == "host"
     end
 
     it "should set Linux-VServer guest if /proc/self/status contains s_context > 0" do
       File.should_receive(:exists?).with("/proc/self/status").and_return(true)
-      File.stub!(:read).with("/proc/self/status").and_return("s_context: 2")
-      @ohai._require_plugin("linux::virtualization")
-      @ohai[:virtualization][:system].should == "linux-vserver"
-      @ohai[:virtualization][:role].should == "guest"
+      File.stub(:read).with("/proc/self/status").and_return("s_context: 2")
+      @plugin.run
+      @plugin[:virtualization][:system].should == "linux-vserver"
+      @plugin[:virtualization][:role].should == "guest"
     end
 
     it "should set Linux-VServer guest if /proc/self/status contains VxID > 0" do
       File.should_receive(:exists?).with("/proc/self/status").and_return(true)
-      File.stub!(:read).with("/proc/self/status").and_return("VxID: 2")
-      @ohai._require_plugin("linux::virtualization")
-      @ohai[:virtualization][:system].should == "linux-vserver"
-      @ohai[:virtualization][:role].should == "guest"
+      File.stub(:read).with("/proc/self/status").and_return("VxID: 2")
+      @plugin.run
+      @plugin[:virtualization][:system].should == "linux-vserver"
+      @plugin[:virtualization][:role].should == "guest"
     end
 
     it "should not set virtualization if Linux-VServer isn't there" do
       File.should_receive(:exists?).at_least(:once).and_return(false)
-      @ohai._require_plugin("linux::virtualization")
-      @ohai[:virtualization].should == {}
+      @plugin.run
+      @plugin[:virtualization].should == {}
+    end
+  end
+
+  describe "when we are checking for openvz" do
+    it "should set openvz host if /proc/bc/0 exists" do
+      File.should_receive(:exists?).with("/proc/bc/0").and_return(true)
+      @plugin.run
+      @plugin[:virtualization][:system].should == "openvz"
+      @plugin[:virtualization][:role].should == "host"
+    end
+
+    it "should set openvz guest if /proc/bc/0 doesn't exist and /proc/vz exists" do
+      File.should_receive(:exists?).with("/proc/bc/0").and_return(false)
+      File.should_receive(:exists?).with("/proc/vz").and_return(true)
+      @plugin.run
+      @plugin[:virtualization][:system].should == "openvz"
+      @plugin[:virtualization][:role].should == "guest"
+    end
+
+    it "should not set virtualization if openvz isn't there" do
+      File.should_receive(:exists?).with("/proc/bc/0").and_return(false)
+      File.should_receive(:exists?).with("/proc/vz").and_return(false)
+      @plugin.run
+      @plugin[:virtualization].should == {}
     end
   end
-	describe "when we are checking for openvz" do
-		it "should set openvz host if /proc/bc/0 exists" do
-			File.should_receive(:exists?).with("/proc/bc/0").and_return(true)
-			@ohai._require_plugin("linux::virtualization")
-			@ohai[:virtualization][:system].should == "openvz"
-			@ohai[:virtualization][:role].should == "host"
-		end
-
-		it "should set openvz guest if /proc/bc/0 doesn't exist and /proc/vz exists" do
-			File.should_receive(:exists?).with("/proc/bc/0").and_return(false)
-			File.should_receive(:exists?).with("/proc/vz").and_return(true)
-			@ohai._require_plugin("linux::virtualization")
-			@ohai[:virtualization][:system].should == "openvz"
-			@ohai[:virtualization][:role].should == "guest"
-		end
-
-		it "should not set virtualization if openvz isn't there" do
-			File.should_receive(:exists?).with("/proc/bc/0").and_return(false)
-			File.should_receive(:exists?).with("/proc/vz").and_return(false)
-			@ohai._require_plugin("linux::virtualization")
-			@ohai[:virtualization].should == {}
-		end
-	end
 
   it "should not set virtualization if no tests match" do
-    @ohai._require_plugin("linux::virtualization")
-    @ohai[:virtualization].should == {}
+    @plugin.run
+    @plugin[:virtualization].should == {}
   end
 end
-
-

data/spec/unit/plugins/lua_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");
@@ -22,32 +24,27 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '/spec_he
 describe Ohai::System, "plugin lua" do
 
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai[:languages] = Mash.new
-    @ohai.stub!(:require_plugin).and_return(true)
-    @status = 0
-    @stdout = ""
+    @plugin = get_plugin("lua")
+    @plugin[:languages] = Mash.new
     @stderr = "Lua 5.1.2  Copyright (C) 1994-2008 Lua.org, PUC-Rio\n"
-    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"lua -v"}).and_return([@status, @stdout, @stderr])
+    @plugin.stub(:shell_out).with("lua -v").and_return(mock_shell_out(0, "", @stderr))
   end
 
   it "should get the lua version from running lua -v" do
-    @ohai.should_receive(:run_command).with({:no_status_check=>true, :command=>"lua -v"}).and_return([0, "", "Lua 5.1.2  Copyright (C) 1994-2008 Lua.org, PUC-Rio\n"])
-    @ohai._require_plugin("lua")
+    @plugin.should_receive(:shell_out).with("lua -v").and_return(mock_shell_out(0, "", @stderr))
+    @plugin.run
   end
 
   it "should set languages[:lua][:version]" do
-    @ohai._require_plugin("lua")
-    @ohai.languages[:lua][:version].should eql("5.1.2")
+    @plugin.run
+    @plugin.languages[:lua][:version].should eql("5.1.2")
   end
 
   it "should not set the languages[:lua] tree up if lua command fails" do
-    @status = 1
-    @stdout = ""
     @stderr = "Lua 5.1.2  Copyright (C) 1994-2008 Lua.org, PUC-Rio\n"
-    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"lua -v"}).and_return([@status, @stdout, @stderr])
-    @ohai._require_plugin("lua")
-    @ohai.languages.should_not have_key(:lua)
+    @plugin.stub(:shell_out).with("lua -v").and_return(mock_shell_out(1, "", @stderr))
+    @plugin.run
+    @plugin.languages.should_not have_key(:lua)
   end
 
 end