ohai 6.24.2 → 7.0.0.rc.0

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

@@ -21,11 +21,10 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "Linux cpu plugin" do
   before(:each) do
-    @ohai = Ohai::System.new    
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai[:os] = "linux"
-    @mock_file = mock("/proc/cpuinfo")
-    @mock_file.stub!(:each).
+    @plugin = get_plugin("linux/cpu")
+    @plugin.stub(:collect_os).and_return(:linux)
+    @double_file = double("/proc/cpuinfo")
+    @double_file.stub(:each).
       and_yield("processor     : 0").
       and_yield("vendor_id     : GenuineIntel").
       and_yield("cpu family    : 6").
@@ -45,84 +44,84 @@ describe Ohai::System, "Linux cpu plugin" do
       and_yield("flags         : fpu pse tsc msr mce cx8 sep mtrr pge cmov").
       and_yield("bogomips      : 2575.86").
       and_yield("clflush size  : 32")
-    File.stub!(:open).with("/proc/cpuinfo").and_return(@mock_file)
+    File.stub(:open).with("/proc/cpuinfo").and_return(@double_file)
   end
   
   it "should set cpu[:total] to 1" do
-    @ohai._require_plugin("linux::cpu")
-    @ohai[:cpu][:total].should == 1
+    @plugin.run
+    @plugin[:cpu][:total].should == 1
   end
   
   it "should set cpu[:real] to 0" do
-    @ohai._require_plugin("linux::cpu")
-    @ohai[:cpu][:real].should == 0
+    @plugin.run
+    @plugin[:cpu][:real].should == 0
   end
   
   it "should have a cpu 0" do
-    @ohai._require_plugin("linux::cpu")
-    @ohai[:cpu].should have_key("0")
+    @plugin.run
+    @plugin[:cpu].should have_key("0")
   end
   
   it "should have a vendor_id for cpu 0" do
-    @ohai._require_plugin("linux::cpu")
-    @ohai[:cpu]["0"].should have_key("vendor_id")
-    @ohai[:cpu]["0"]["vendor_id"].should eql("GenuineIntel")
+    @plugin.run
+    @plugin[:cpu]["0"].should have_key("vendor_id")
+    @plugin[:cpu]["0"]["vendor_id"].should eql("GenuineIntel")
   end
   
   it "should have a family for cpu 0" do
-    @ohai._require_plugin("linux::cpu")
-    @ohai[:cpu]["0"].should have_key("family")
-    @ohai[:cpu]["0"]["family"].should eql("6")
+    @plugin.run
+    @plugin[:cpu]["0"].should have_key("family")
+    @plugin[:cpu]["0"]["family"].should eql("6")
   end
   
   it "should have a model for cpu 0" do
-    @ohai._require_plugin("linux::cpu")
-    @ohai[:cpu]["0"].should have_key("model")
-    @ohai[:cpu]["0"]["model"].should eql("23")
+    @plugin.run
+    @plugin[:cpu]["0"].should have_key("model")
+    @plugin[:cpu]["0"]["model"].should eql("23")
   end
   
   it "should have a stepping for cpu 0" do
-    @ohai._require_plugin("linux::cpu")
-    @ohai[:cpu]["0"].should have_key("stepping")
-    @ohai[:cpu]["0"]["stepping"].should eql("6")
+    @plugin.run
+    @plugin[:cpu]["0"].should have_key("stepping")
+    @plugin[:cpu]["0"]["stepping"].should eql("6")
   end
   
   it "should not have a phyiscal_id for cpu 0" do
-    @ohai._require_plugin("linux::cpu")
-    @ohai[:cpu]["0"].should_not have_key("physical_id")
+    @plugin.run
+    @plugin[:cpu]["0"].should_not have_key("physical_id")
   end
   
   it "should not have a core_id for cpu 0" do
-    @ohai._require_plugin("linux::cpu")
-    @ohai[:cpu]["0"].should_not have_key("core_id")
+    @plugin.run
+    @plugin[:cpu]["0"].should_not have_key("core_id")
   end
   
   it "should not have a cores for cpu 0" do
-    @ohai._require_plugin("linux::cpu")
-    @ohai[:cpu]["0"].should_not have_key("cores")
+    @plugin.run
+    @plugin[:cpu]["0"].should_not have_key("cores")
   end
   
   it "should have a model name for cpu 0" do
-    @ohai._require_plugin("linux::cpu")
-    @ohai[:cpu]["0"].should have_key("model_name")
-    @ohai[:cpu]["0"]["model_name"].should eql("Intel(R) Core(TM)2 Duo CPU     T8300   @ 2.40GHz")
+    @plugin.run
+    @plugin[:cpu]["0"].should have_key("model_name")
+    @plugin[:cpu]["0"]["model_name"].should eql("Intel(R) Core(TM)2 Duo CPU     T8300   @ 2.40GHz")
   end
   
   it "should have a mhz for cpu 0" do
-    @ohai._require_plugin("linux::cpu")
-    @ohai[:cpu]["0"].should have_key("mhz")
-    @ohai[:cpu]["0"]["mhz"].should eql("1968.770")
+    @plugin.run
+    @plugin[:cpu]["0"].should have_key("mhz")
+    @plugin[:cpu]["0"]["mhz"].should eql("1968.770")
   end
   
   it "should have a cache_size for cpu 0" do
-    @ohai._require_plugin("linux::cpu")
-    @ohai[:cpu]["0"].should have_key("cache_size")
-    @ohai[:cpu]["0"]["cache_size"].should eql("64 KB")
+    @plugin.run
+    @plugin[:cpu]["0"].should have_key("cache_size")
+    @plugin[:cpu]["0"]["cache_size"].should eql("64 KB")
   end
   
   it "should have flags for cpu 0" do
-    @ohai._require_plugin("linux::cpu")
-    @ohai[:cpu]["0"].should have_key("flags")
-    @ohai[:cpu]["0"]["flags"].should == %w{fpu pse tsc msr mce cx8 sep mtrr pge cmov}
+    @plugin.run
+    @plugin[:cpu]["0"].should have_key("flags")
+    @plugin[:cpu]["0"]["flags"].should == %w{fpu pse tsc msr mce cx8 sep mtrr pge cmov}
   end
-end
+end

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

@@ -20,418 +20,237 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "Linux filesystem plugin" 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/filesystem")
+    @plugin.stub(:collect_os).and_return(:linux)
 
-    stdout = mock("STDOUT_SKEL")
-    stderr = mock("STDERR_SKEL")
-    stdout.stub!(:each_line).and_yield('')
-    stderr.stub!(:each_line).and_yield('')
+    @plugin.stub(:shell_out).with("df -P").and_return(mock_shell_out(0, "", ""))
+    @plugin.stub(:shell_out).with("mount").and_return(mock_shell_out(0, "", ""))
+    @plugin.stub(:shell_out).with("blkid -s TYPE").and_return(mock_shell_out(0, "", ""))
+    @plugin.stub(:shell_out).with("blkid -s UUID").and_return(mock_shell_out(0, "", ""))
+    @plugin.stub(:shell_out).with("blkid -s LABEL").and_return(mock_shell_out(0, "", ""))
 
-    @df_cmd = {
-      :command => "df -P",
-      :timeout => 120,
-      :no_status_check => true
-    }
-    @mount_cmd = {
-      :command => "mount",
-      :timeout => 120,
-    }
-
-    @ohai.stub!(:run_command).with(@df_cmd).and_return([0,stdout,stderr])
-    @ohai.stub!(:run_command).with(@mount_cmd).and_return([0,stdout,stderr])
-    File.stub!(:exists?).with("/bin/lsblk").and_return(false)
-    @ohai.stub!(:popen4).with("blkid -s TYPE").and_return(false)
-    @ohai.stub!(:popen4).with("blkid -s UUID").and_return(false)
-    @ohai.stub!(:popen4).with("blkid -s LABEL").and_return(false)
-
-    @ohai.stub!(:popen4).with("lsblk -r -o NAME,FSTYPE -n").and_return(false)
-    @ohai.stub!(:popen4).with("lsblk -r -o NAME,UUID -n").and_return(false)
-    @ohai.stub!(:popen4).with("lsblk -r -o NAME,LABEL -n").and_return(false)
-
-    File.stub!(:exists?).with("/proc/mounts").and_return(false)
-
-    %w{sdb1 sdb2 sda1 sda2 md0 md1 md2}.each do |name|
-      File.stub!(:exist?).with("/dev/#{name}").and_return(true)
-    end
-    %w{
-      sys.vg-root.lv
-      sys.vg-swap.lv
-      sys.vg-tmp.lv
-      sys.vg-usr.lv
-      sys.vg-var.lv
-      sys.vg-home.lv
-    }.each do |name|
-      File.stub!(:exist?).with("/dev/#{name}").and_return(false)
-      File.stub!(:exist?).with("/dev/mapper/#{name}").and_return(true)
-    end
+    File.stub(:exists?).with("/proc/mounts").and_return(false)
   end
 
   describe "when gathering filesystem usage data from df" do
     before(:each) do
-      @stdin = mock("STDIN", { :close => true })
-      @pid = 10
-      @stderr = mock("STDERR")
-      @stdout = mock("STDOUT")
-      @status = 0
-
-      @stdout.stub!(:each_line).
-        and_yield("Filesystem         1024-blocks      Used Available Capacity Mounted on").
-        and_yield("/dev/mapper/sys.vg-root.lv   4805760    378716   4182924       9% /").
-        and_yield("tmpfs                  2030944         0   2030944       0% /lib/init/rw").
-        and_yield("udev                   2025576       228   2025348       1% /dev").
-        and_yield("tmpfs                  2030944      2960   2027984       1% /dev/shm").
-        and_yield("/dev/mapper/sys.vg-home.lv  97605056  53563252  44041804      55% /home").
-        and_yield("/dev/mapper/sys.vg-special.lv  97605057  53563253  44041805      56% /special").
-        and_yield("/dev/mapper/sys.vg-tmp.lv   1919048     46588   1774976       3% /tmp").
-        and_yield("/dev/mapper/sys.vg-usr.lv  19223252   5479072  12767696      31% /usr").
-        and_yield("/dev/mapper/sys.vg-var.lv  19223252   3436556  14810212      19% /var").
-        and_yield("/dev/md0                960492     36388    875312       4% /boot")
+      @stdout = <<-DF
+Filesystem         1024-blocks      Used Available Capacity Mounted on
+/dev/mapper/sys.vg-root.lv   4805760    378716   4182924       9% /
+tmpfs                  2030944         0   2030944       0% /lib/init/rw
+udev                   2025576       228   2025348       1% /dev
+tmpfs                  2030944      2960   2027984       1% /dev/shm
+/dev/mapper/sys.vg-home.lv  97605056  53563252  44041804      55% /home
+/dev/mapper/sys.vg-special.lv  97605057  53563253  44041805      56% /special
+/dev/mapper/sys.vg-tmp.lv   1919048     46588   1774976       3% /tmp
+/dev/mapper/sys.vg-usr.lv  19223252   5479072  12767696      31% /usr
+/dev/mapper/sys.vg-var.lv  19223252   3436556  14810212      19% /var
+/dev/md0                960492     36388    875312       4% /boot
+DF
+      @plugin.stub(:shell_out).with("df -P").and_return(mock_shell_out(0, @stdout, ""))
     end
 
     it "should run df -P" do
-      @ohai.should_receive(:run_command).with(@df_cmd).and_return(true)
-      @ohai._require_plugin("linux::filesystem")
+      @plugin.should_receive(:shell_out).with("df -P").and_return(mock_shell_out(0, @stdout, ""))
+      @plugin.run
     end
 
     it "should set kb_size to value from df -P" do
-      @ohai.stub!(:run_command).with(@df_cmd).and_return([@status, @stdout, @stderr])
-      @ohai._require_plugin("linux::filesystem")
-      @ohai[:filesystem]["/dev/mapper/sys.vg-special.lv"][:kb_size].should be == "97605057"
+      @plugin.run
+      @plugin[:filesystem]["/dev/mapper/sys.vg-special.lv"][:kb_size].should be == "97605057"
     end
 
     it "should set kb_used to value from df -P" do
-      @ohai.stub!(:run_command).with(@df_cmd).and_return([@status, @stdout, @stderr])
-      @ohai._require_plugin("linux::filesystem")
-      @ohai[:filesystem]["/dev/mapper/sys.vg-special.lv"][:kb_used].should be == "53563253"
+      @plugin.run
+      @plugin[:filesystem]["/dev/mapper/sys.vg-special.lv"][:kb_used].should be == "53563253"
     end
 
     it "should set kb_available to value from df -P" do
-      @ohai.stub!(:run_command).with(@df_cmd).and_return([@status, @stdout, @stderr])
-      @ohai._require_plugin("linux::filesystem")
-      @ohai[:filesystem]["/dev/mapper/sys.vg-special.lv"][:kb_available].should be == "44041805"
+      @plugin.run
+      @plugin[:filesystem]["/dev/mapper/sys.vg-special.lv"][:kb_available].should be == "44041805"
     end
 
     it "should set percent_used to value from df -P" do
-      @ohai.stub!(:run_command).with(@df_cmd).and_return([@status, @stdout, @stderr])
-      @ohai._require_plugin("linux::filesystem")
-      @ohai[:filesystem]["/dev/mapper/sys.vg-special.lv"][:percent_used].should be == "56%"
+      @plugin.run
+      @plugin[:filesystem]["/dev/mapper/sys.vg-special.lv"][:percent_used].should be == "56%"
     end
 
     it "should set mount to value from df -P" do
-      @ohai.stub!(:run_command).with(@df_cmd).and_return([@status, @stdout, @stderr])
-      @ohai._require_plugin("linux::filesystem")
-      @ohai[:filesystem]["/dev/mapper/sys.vg-special.lv"][:mount].should be == "/special"
+      @plugin.run
+      @plugin[:filesystem]["/dev/mapper/sys.vg-special.lv"][:mount].should be == "/special"
     end
   end
 
   describe "when gathering mounted filesystem data from mount" do
     before(:each) do
-      @stdin = mock("STDIN", { :close => true })
-      @pid = 10
-      @stderr = mock("STDERR")
-      @stdout = mock("STDOUT")
-      @status = 0
-
-      @stdout.stub!(:each_line).
-        and_yield("/dev/mapper/sys.vg-root.lv on / type ext4 (rw,noatime,errors=remount-ro)").
-        and_yield("tmpfs on /lib/init/rw type tmpfs (rw,nosuid,mode=0755)").
-        and_yield("proc on /proc type proc (rw,noexec,nosuid,nodev)").
-        and_yield("sysfs on /sys type sysfs (rw,noexec,nosuid,nodev)").
-        and_yield("udev on /dev type tmpfs (rw,mode=0755)").
-        and_yield("tmpfs on /dev/shm type tmpfs (rw,nosuid,nodev)").
-        and_yield("devpts on /dev/pts type devpts (rw,noexec,nosuid,gid=5,mode=620)").
-        and_yield("/dev/mapper/sys.vg-home.lv on /home type xfs (rw,noatime)").
-        and_yield("/dev/mapper/sys.vg-special.lv on /special type xfs (ro,noatime)").
-        and_yield("/dev/mapper/sys.vg-tmp.lv on /tmp type ext4 (rw,noatime)").
-        and_yield("/dev/mapper/sys.vg-usr.lv on /usr type ext4 (rw,noatime)").
-        and_yield("/dev/mapper/sys.vg-var.lv on /var type ext4 (rw,noatime)").
-        and_yield("/dev/md0 on /boot type ext3 (rw,noatime,errors=remount-ro)").
-        and_yield("fusectl on /sys/fs/fuse/connections type fusectl (rw)").
-        and_yield("binfmt_misc on /proc/sys/fs/binfmt_misc type binfmt_misc (rw,noexec,nosuid,nodev)")
+      @stdout = <<-MOUNT
+/dev/mapper/sys.vg-root.lv on / type ext4 (rw,noatime,errors=remount-ro)
+tmpfs on /lib/init/rw type tmpfs (rw,nosuid,mode=0755)
+proc on /proc type proc (rw,noexec,nosuid,nodev)
+sysfs on /sys type sysfs (rw,noexec,nosuid,nodev)
+udev on /dev type tmpfs (rw,mode=0755)
+tmpfs on /dev/shm type tmpfs (rw,nosuid,nodev)
+devpts on /dev/pts type devpts (rw,noexec,nosuid,gid=5,mode=620)
+/dev/mapper/sys.vg-home.lv on /home type xfs (rw,noatime)
+/dev/mapper/sys.vg-special.lv on /special type xfs (ro,noatime)
+/dev/mapper/sys.vg-tmp.lv on /tmp type ext4 (rw,noatime)
+/dev/mapper/sys.vg-usr.lv on /usr type ext4 (rw,noatime)
+/dev/mapper/sys.vg-var.lv on /var type ext4 (rw,noatime)
+/dev/md0 on /boot type ext3 (rw,noatime,errors=remount-ro)
+fusectl on /sys/fs/fuse/connections type fusectl (rw)
+binfmt_misc on /proc/sys/fs/binfmt_misc type binfmt_misc (rw,noexec,nosuid,nodev)
+MOUNT
+      @plugin.stub(:shell_out).with("mount").and_return(mock_shell_out(0, @stdout, ""))
     end
 
     it "should run mount" do
-      @ohai.stub!(:run_command).with(@mount_cmd).and_return([@status, @stdout, @stderr])
-      @ohai._require_plugin("linux::filesystem")
+      @plugin.should_receive(:shell_out).with("mount").and_return(mock_shell_out(0, @stdout, ""))
+      @plugin.run
     end
 
     it "should set mount to value from mount" do
-      @ohai.stub!(:run_command).with(@mount_cmd).and_return([@status, @stdout, @stderr])
-      @ohai._require_plugin("linux::filesystem")
-      @ohai[:filesystem]["/dev/mapper/sys.vg-special.lv"][:mount].should be == "/special"
+      @plugin.run
+      @plugin[:filesystem]["/dev/mapper/sys.vg-special.lv"][:mount].should be == "/special"
     end
 
     it "should set fs_type to value from mount" do
-      @ohai.stub!(:run_command).with(@mount_cmd).and_return([@status, @stdout, @stderr])
-      @ohai._require_plugin("linux::filesystem")
-      @ohai[:filesystem]["/dev/mapper/sys.vg-special.lv"][:fs_type].should be == "xfs"
+      @plugin.run
+      @plugin[:filesystem]["/dev/mapper/sys.vg-special.lv"][:fs_type].should be == "xfs"
     end
 
     it "should set mount_options to an array of values from mount" do
-      @ohai.stub!(:run_command).with(@mount_cmd).and_return([@status, @stdout, @stderr])
-      @ohai._require_plugin("linux::filesystem")
-      @ohai[:filesystem]["/dev/mapper/sys.vg-special.lv"][:mount_options].should be == [ "ro", "noatime" ]
+      @plugin.run
+      @plugin[:filesystem]["/dev/mapper/sys.vg-special.lv"][:mount_options].should be == [ "ro", "noatime" ]
     end
   end
 
   describe "when gathering filesystem type data from blkid" do
     before(:each) do
-      @stdin = mock("STDIN", { :close => true })
-      @pid = 10
-      @stderr = mock("STDERR")
-      @stdout = mock("STDOUT")
-      @status = 0
-
-      @stdout.stub!(:each).
-        and_yield("/dev/sdb1: TYPE=\"linux_raid_member\" ").
-        and_yield("/dev/sdb2: TYPE=\"linux_raid_member\" ").
-        and_yield("/dev/sda1: TYPE=\"linux_raid_member\" ").
-        and_yield("/dev/sda2: TYPE=\"linux_raid_member\" ").
-        and_yield("/dev/md0: TYPE=\"ext3\" ").
-        and_yield("/dev/md1: TYPE=\"LVM2_member\" ").
-        and_yield("/dev/mapper/sys.vg-root.lv: TYPE=\"ext4\" ").
-        and_yield("/dev/mapper/sys.vg-swap.lv: TYPE=\"swap\" ").
-        and_yield("/dev/mapper/sys.vg-tmp.lv: TYPE=\"ext4\" ").
-        and_yield("/dev/mapper/sys.vg-usr.lv: TYPE=\"ext4\" ").
-        and_yield("/dev/mapper/sys.vg-var.lv: TYPE=\"ext4\" ").
-        and_yield("/dev/mapper/sys.vg-home.lv: TYPE=\"xfs\" ")
+      @stdout = <<-BLKID_TYPE
+dev/sdb1: TYPE=\"linux_raid_member\" 
+/dev/sdb2: TYPE=\"linux_raid_member\" 
+/dev/sda1: TYPE=\"linux_raid_member\" 
+/dev/sda2: TYPE=\"linux_raid_member\" 
+/dev/md0: TYPE=\"ext3\" 
+/dev/md1: TYPE=\"LVM2_member\" 
+/dev/mapper/sys.vg-root.lv: TYPE=\"ext4\" 
+/dev/mapper/sys.vg-swap.lv: TYPE=\"swap\" 
+/dev/mapper/sys.vg-tmp.lv: TYPE=\"ext4\" 
+/dev/mapper/sys.vg-usr.lv: TYPE=\"ext4\" 
+/dev/mapper/sys.vg-var.lv: TYPE=\"ext4\" 
+/dev/mapper/sys.vg-home.lv: TYPE=\"xfs\" 
+BLKID_TYPE
+      @plugin.stub(:shell_out).with("blkid -s TYPE").and_return(mock_shell_out(0, @stdout, ""))
     end
 
     it "should run blkid -s TYPE" do
-      @ohai.should_receive(:popen4).with("blkid -s TYPE").and_return(true)
-      @ohai._require_plugin("linux::filesystem")
+      @plugin.should_receive(:shell_out).with("blkid -s TYPE").and_return(mock_shell_out(0, @stdout, ""))
+      @plugin.run
     end
 
     it "should set kb_size to value from blkid -s TYPE" do
-      @ohai.stub!(:popen4).with("blkid -s TYPE").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
-      @ohai._require_plugin("linux::filesystem")
-      @ohai[:filesystem]["/dev/md1"][:fs_type].should be == "LVM2_member"
-    end
-  end
-
-  describe "when gathering filesystem type data from lsblk" do
-    before(:each) do
-      File.stub!(:exists?).with('/bin/lsblk').and_return(true)
-      @stdin = mock("STDIN", { :close => true })
-      @pid = 10
-      @stderr = mock("STDERR")
-      @stdout = mock("STDOUT")
-      @status = 0
-
-      @stdout.stub!(:each).
-        and_yield("sdb1 linux_raid_member").
-        and_yield("sdb2 linux_raid_member").
-        and_yield("sda1 linux_raid_member").
-        and_yield("sda2 linux_raid_member").
-        and_yield("md0 ext3").
-        and_yield("md1 LVM2_member").
-        and_yield("sys.vg-root.lv ext4").
-        and_yield("sys.vg-swap.lv swap").
-        and_yield("sys.vg-tmp.lv ext4").
-        and_yield("sys.vg-usr.lv ext4").
-        and_yield("sys.vg-var.lv ext4").
-        and_yield("sys.vg-home.lv xfs")
-    end
-
-    it "should run lsblk -r -o NAME,FSTYPE -n" do
-      @ohai.should_receive(:popen4).with("lsblk -r -o NAME,FSTYPE -n").
-        and_return(true)
-      @ohai._require_plugin("linux::filesystem")
+      @plugin.run
+      @plugin[:filesystem]["/dev/md1"][:fs_type].should be == "LVM2_member"
     end
   end
 
   describe "when gathering filesystem uuid data from blkid" do
     before(:each) do
-      @stdin = mock("STDIN", { :close => true })
-      @pid = 10
-      @stderr = mock("STDERR")
-      @stdout = mock("STDOUT")
-      @status = 0
-
-      @stdout.stub!(:each).
-        and_yield("/dev/sdb1: UUID=\"bd1197e0-6997-1f3a-e27e-7801388308b5\" ").
-        and_yield("/dev/sdb2: UUID=\"e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa\" ").
-        and_yield("/dev/sda1: UUID=\"bd1197e0-6997-1f3a-e27e-7801388308b5\" ").
-        and_yield("/dev/sda2: UUID=\"e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa\" ").
-        and_yield("/dev/md0: UUID=\"37b8de8e-0fe3-4b5a-b9b4-dde33e19bb32\" ").
-        and_yield("/dev/md1: UUID=\"YsIe0R-fj1y-LXTd-imla-opKo-OuIe-TBoxSK\" ").
-        and_yield("/dev/mapper/sys.vg-root.lv: UUID=\"7742d14b-80a3-4e97-9a32-478be9ea9aea\" ").
-        and_yield("/dev/mapper/sys.vg-swap.lv: UUID=\"9bc2e515-8ddc-41c3-9f63-4eaebde9ce96\" ").
-        and_yield("/dev/mapper/sys.vg-tmp.lv: UUID=\"74cf7eb9-428f-479e-9a4a-9943401e81e5\" ").
-        and_yield("/dev/mapper/sys.vg-usr.lv: UUID=\"26ec33c5-d00b-4f88-a550-492def013bbc\" ").
-        and_yield("/dev/mapper/sys.vg-var.lv: UUID=\"6b559c35-7847-4ae2-b512-c99012d3f5b3\" ").
-        and_yield("/dev/mapper/sys.vg-home.lv: UUID=\"d6efda02-1b73-453c-8c74-7d8dee78fa5e\" ")
+      @stdout = <<-BLKID_UUID
+/dev/sdb1: UUID=\"bd1197e0-6997-1f3a-e27e-7801388308b5\" 
+/dev/sdb2: UUID=\"e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa\" 
+/dev/sda1: UUID=\"bd1197e0-6997-1f3a-e27e-7801388308b5\" 
+/dev/sda2: UUID=\"e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa\" 
+/dev/md0: UUID=\"37b8de8e-0fe3-4b5a-b9b4-dde33e19bb32\" 
+/dev/md1: UUID=\"YsIe0R-fj1y-LXTd-imla-opKo-OuIe-TBoxSK\" 
+/dev/mapper/sys.vg-root.lv: UUID=\"7742d14b-80a3-4e97-9a32-478be9ea9aea\" 
+/dev/mapper/sys.vg-swap.lv: UUID=\"9bc2e515-8ddc-41c3-9f63-4eaebde9ce96\" 
+/dev/mapper/sys.vg-tmp.lv: UUID=\"74cf7eb9-428f-479e-9a4a-9943401e81e5\" 
+/dev/mapper/sys.vg-usr.lv: UUID=\"26ec33c5-d00b-4f88-a550-492def013bbc\" 
+/dev/mapper/sys.vg-var.lv: UUID=\"6b559c35-7847-4ae2-b512-c99012d3f5b3\" 
+/dev/mapper/sys.vg-home.lv: UUID=\"d6efda02-1b73-453c-8c74-7d8dee78fa5e\" 
+BLKID_UUID
+      @plugin.stub(:shell_out).with("blkid -s UUID").and_return(mock_shell_out(0, @stdout, ""))
     end
 
     it "should run blkid -s UUID" do
-      @ohai.should_receive(:popen4).with("blkid -s UUID").and_return(true)
-      @ohai._require_plugin("linux::filesystem")
+      @plugin.should_receive(:shell_out).with("blkid -s UUID").and_return(mock_shell_out(0, @stdout, ""))
+      @plugin.run
     end
 
     it "should set kb_size to value from blkid -s UUID" do
-      @ohai.stub!(:popen4).with("blkid -s UUID").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
-      @ohai._require_plugin("linux::filesystem")
-      @ohai[:filesystem]["/dev/sda2"][:uuid].should be == "e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa"
-    end
-  end
-
-  describe "when gathering filesystem uuid data from lsblk" do
-    before(:each) do
-      File.stub!(:exists?).with('/bin/lsblk').and_return(true)
-      @stdin = mock("STDIN", { :close => true })
-      @pid = 10
-      @stderr = mock("STDERR")
-      @stdout = mock("STDOUT")
-      @status = 0
-
-      @stdout.stub!(:each).
-        and_yield("sdb1 bd1197e0-6997-1f3a-e27e-7801388308b5").
-        and_yield("sdb2 e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa").
-        and_yield("sda1 bd1197e0-6997-1f3a-e27e-7801388308b5").
-        and_yield("sda2 e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa").
-        and_yield("md0 37b8de8e-0fe3-4b5a-b9b4-dde33e19bb32").
-        and_yield("md1 YsIe0R-fj1y-LXTd-imla-opKo-OuIe-TBoxSK").
-        and_yield("sys.vg-root.lv 7742d14b-80a3-4e97-9a32-478be9ea9aea").
-        and_yield("sys.vg-swap.lv 9bc2e515-8ddc-41c3-9f63-4eaebde9ce96").
-        and_yield("sys.vg-tmp.lv 74cf7eb9-428f-479e-9a4a-9943401e81e5").
-        and_yield("sys.vg-usr.lv 26ec33c5-d00b-4f88-a550-492def013bbc").
-        and_yield("sys.vg-var.lv 6b559c35-7847-4ae2-b512-c99012d3f5b3").
-        and_yield("sys.vg-home.lv d6efda02-1b73-453c-8c74-7d8dee78fa5e")
-    end
-
-    it "should run lsblk -r -o NAME,UUID -n" do
-      @ohai.should_receive(:popen4).with("lsblk -r -o NAME,UUID -n").
-        and_return(true)
-      @ohai._require_plugin("linux::filesystem")
-    end
-
-    it "should set kb_size to value from lsblk -r -o NAME,UUID -n" do
-      @ohai.stub!(:popen4).with("lsblk -r -o NAME,UUID -n").
-        and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
-      @ohai._require_plugin("linux::filesystem")
-      @ohai[:filesystem]["/dev/sda2"][:uuid].should be == "e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa"
+      @plugin.run
+      @plugin[:filesystem]["/dev/sda2"][:uuid].should be == "e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa"
     end
   end
 
   describe "when gathering filesystem label data from blkid" do
     before(:each) do
-      @stdin = mock("STDIN", { :close => true })
-      @pid = 10
-      @stderr = mock("STDERR")
-      @stdout = mock("STDOUT")
-      @status = 0
-
-      @stdout.stub!(:each).
-        and_yield("/dev/sda1: LABEL=\"fuego:0\" ").
-        and_yield("/dev/sda2: LABEL=\"fuego:1\" ").
-        and_yield("/dev/sdb1: LABEL=\"fuego:0\" ").
-        and_yield("/dev/sdb2: LABEL=\"fuego:1\" ").
-        and_yield("/dev/md0: LABEL=\"/boot\" ").
-        and_yield("/dev/mapper/sys.vg-root.lv: LABEL=\"/\" ").
-        and_yield("/dev/mapper/sys.vg-tmp.lv: LABEL=\"/tmp\" ").
-        and_yield("/dev/mapper/sys.vg-usr.lv: LABEL=\"/usr\" ").
-        and_yield("/dev/mapper/sys.vg-var.lv: LABEL=\"/var\" ").
-        and_yield("/dev/mapper/sys.vg-home.lv: LABEL=\"/home\" ")
+      @stdout = <<-BLKID_LABEL
+/dev/sda1: LABEL=\"fuego:0\" 
+/dev/sda2: LABEL=\"fuego:1\" 
+/dev/sdb1: LABEL=\"fuego:0\" 
+/dev/sdb2: LABEL=\"fuego:1\" 
+/dev/md0: LABEL=\"/boot\" 
+/dev/mapper/sys.vg-root.lv: LABEL=\"/\" 
+/dev/mapper/sys.vg-tmp.lv: LABEL=\"/tmp\" 
+/dev/mapper/sys.vg-usr.lv: LABEL=\"/usr\" 
+/dev/mapper/sys.vg-var.lv: LABEL=\"/var\" 
+/dev/mapper/sys.vg-home.lv: LABEL=\"/home\" 
+BLKID_LABEL
+      @plugin.stub(:shell_out).with("blkid -s LABEL").and_return(mock_shell_out(0, @stdout, ""))
     end
 
     it "should run blkid -s LABEL" do
-      @ohai.should_receive(:popen4).with("blkid -s LABEL").and_return(true)
-      @ohai._require_plugin("linux::filesystem")
+      @plugin.should_receive(:shell_out).with("blkid -s LABEL").and_return(mock_shell_out(0, @stdout, ""))
+      @plugin.run
     end
 
     it "should set kb_size to value from blkid -s LABEL" do
-      @ohai.stub!(:popen4).with("blkid -s LABEL").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
-      @ohai._require_plugin("linux::filesystem")
-      @ohai[:filesystem]["/dev/md0"][:label].should be == "/boot"
+      @plugin.run
+      @plugin[:filesystem]["/dev/md0"][:label].should be == "/boot"
     end
   end
 
-  describe "when gathering filesystem label data from lsblk" do
-    before(:each) do
-      File.stub!(:exists?).with('/bin/lsblk').and_return(true)
-      @stdin = mock("STDIN", { :close => true })
-      @pid = 10
-      @stderr = mock("STDERR")
-      @stdout = mock("STDOUT")
-      @status = 0
-
-      @stdout.stub!(:each).
-        and_yield("sda1 fuego:0").
-        and_yield("sda2 fuego:1").
-        and_yield("sdb1 fuego:0").
-        and_yield("sdb2 fuego:1").
-        and_yield("md0 /boot").
-        and_yield("sys.vg-root.lv /").
-        and_yield("sys.vg-tmp.lv /tmp").
-        and_yield("sys.vg-usr.lv /usr").
-        and_yield("sys.vg-var.lv /var").
-        and_yield("sys.vg-home.lv /home")
-    end
-
-    it "should run lsblk -r -o NAME,LABEL -n" do
-      @ohai.should_receive(:popen4).with("lsblk -r -o NAME,LABEL -n").
-        and_return(true)
-      @ohai._require_plugin("linux::filesystem")
-    end
-
-    it "should set kb_size to value from lsblk -r -o NAME,LABEL -n" do
-      @ohai.stub!(:popen4).with("lsblk -r -o NAME,LABEL -n").
-        and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
-      @ohai._require_plugin("linux::filesystem")
-      @ohai[:filesystem]["/dev/md0"][:label].should be == "/boot"
-    end
-  end
-
-
   describe "when gathering data from /proc/mounts" do
     before(:each) do
-      File.stub!(:exists?).with("/proc/mounts").and_return(true)
-      @mock_file = mock("/proc/mounts")
-      @mock_file.stub!(:read_nonblock).and_return(@mock_file)
-      @mounts = <<-MOUNTS
-rootfs / rootfs rw 0 0
-none /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0
-none /proc proc rw,nosuid,nodev,noexec,relatime 0 0
-none /dev devtmpfs rw,relatime,size=2025576k,nr_inodes=506394,mode=755 0 0
-none /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0
-/dev/mapper/sys.vg-root.lv / ext4 rw,noatime,errors=remount-ro,barrier=1,data=ordered 0 0
-tmpfs /lib/init/rw tmpfs rw,nosuid,relatime,mode=755 0 0
-tmpfs /dev/shm tmpfs rw,nosuid,nodev,relatime 0 0
-/dev/mapper/sys.vg-home.lv /home xfs rw,noatime,attr2,noquota 0 0
-/dev/mapper/sys.vg-special.lv /special xfs ro,noatime,attr2,noquota 0 0
-/dev/mapper/sys.vg-tmp.lv /tmp ext4 rw,noatime,barrier=1,data=ordered 0 0
-/dev/mapper/sys.vg-usr.lv /usr ext4 rw,noatime,barrier=1,data=ordered 0 0
-/dev/mapper/sys.vg-var.lv /var ext4 rw,noatime,barrier=1,data=ordered 0 0
-/dev/md0 /boot ext3 rw,noatime,errors=remount-ro,data=ordered 0 0
-fusectl /sys/fs/fuse/connections fusectl rw,relatime 0 0
-binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw,nosuid,nodev,noexec,relatime 0 0
-MOUNTS
-      @counter = 0
-      @mock_file.stub(:read_nonblock) do
-        @counter += 1
-        raise EOFError if @counter == 2
-        @mounts
-      end
-      @mock_file.stub(:close)
-      File.stub!(:open).with("/proc/mounts").and_return(@mock_file)
+      File.stub(:exists?).with("/proc/mounts").and_return(true)
+      @double_file = double("/proc/mounts")
+      @double_file.stub(:read_nonblock).and_return(@double_file)
+      @double_file.stub(:each_line).
+        and_yield("rootfs / rootfs rw 0 0").
+        and_yield("none /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0").
+        and_yield("none /proc proc rw,nosuid,nodev,noexec,relatime 0 0").
+        and_yield("none /dev devtmpfs rw,relatime,size=2025576k,nr_inodes=506394,mode=755 0 0").
+        and_yield("none /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0").
+        and_yield("/dev/mapper/sys.vg-root.lv / ext4 rw,noatime,errors=remount-ro,barrier=1,data=ordered 0 0").
+        and_yield("tmpfs /lib/init/rw tmpfs rw,nosuid,relatime,mode=755 0 0").
+        and_yield("tmpfs /dev/shm tmpfs rw,nosuid,nodev,relatime 0 0").
+        and_yield("/dev/mapper/sys.vg-home.lv /home xfs rw,noatime,attr2,noquota 0 0").
+        and_yield("/dev/mapper/sys.vg-special.lv /special xfs ro,noatime,attr2,noquota 0 0").
+        and_yield("/dev/mapper/sys.vg-tmp.lv /tmp ext4 rw,noatime,barrier=1,data=ordered 0 0").
+        and_yield("/dev/mapper/sys.vg-usr.lv /usr ext4 rw,noatime,barrier=1,data=ordered 0 0").
+        and_yield("/dev/mapper/sys.vg-var.lv /var ext4 rw,noatime,barrier=1,data=ordered 0 0").
+        and_yield("/dev/md0 /boot ext3 rw,noatime,errors=remount-ro,data=ordered 0 0").
+        and_yield("fusectl /sys/fs/fuse/connections fusectl rw,relatime 0 0").
+        and_yield("binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw,nosuid,nodev,noexec,relatime 0 0")
+      File.stub(:open).with("/proc/mounts").and_return(@double_file)
     end
 
     it "should set mount to value from /proc/mounts" do
-      @ohai._require_plugin("linux::filesystem")
-      @ohai[:filesystem]["/dev/mapper/sys.vg-special.lv"][:mount].should be == "/special"
+      @plugin.run
+      @plugin[:filesystem]["/dev/mapper/sys.vg-special.lv"][:mount].should be == "/special"
     end
   
     it "should set fs_type to value from /proc/mounts" do
-      @ohai._require_plugin("linux::filesystem")
-      @ohai[:filesystem]["/dev/mapper/sys.vg-special.lv"][:fs_type].should be == "xfs"
+      @plugin.run
+      @plugin[:filesystem]["/dev/mapper/sys.vg-special.lv"][:fs_type].should be == "xfs"
     end
   
     it "should set mount_options to an array of values from /proc/mounts" do
-      @ohai._require_plugin("linux::filesystem")
-      @ohai[:filesystem]["/dev/mapper/sys.vg-special.lv"][:mount_options].should be == [ "ro", "noatime", "attr2", "noquota" ]
+      @plugin.run
+      @plugin[:filesystem]["/dev/mapper/sys.vg-special.lv"][:mount_options].should be == [ "ro", "noatime", "attr2", "noquota" ]
     end
   end
+
 end