chef 12.0.3 → 12.1.0.rc.0

data/spec/unit/provider/group/dscl_spec.rb

@@ -27,16 +27,13 @@ describe Chef::Provider::Group::Dscl do
     @current_resource = Chef::Resource::Group.new("aj")
     @provider = Chef::Provider::Group::Dscl.new(@new_resource, @run_context)
     @provider.current_resource = @current_resource
-    @status = double("Process::Status", :exitstatus => 0)
-    @pid = 2342
-    @stdin = StringIO.new
-    @stdout = StringIO.new("\n")
-    @stderr = StringIO.new("")
-    allow(@provider).to receive(:popen4).and_yield(@pid,@stdin,@stdout,@stderr).and_return(@status)
+
+    @status = double(:stdout => "\n", :stderr => "", :exitstatus => 0)
+    allow(@provider).to receive(:shell_out).and_return(@status)
   end
 
-  it "should run popen4 with the supplied array of arguments appended to the dscl command" do
-    expect(@provider).to receive(:popen4).with("dscl . -cmd /Path arg1 arg2")
+  it "should run shell_out with the supplied array of arguments appended to the dscl command" do
+    expect(@provider).to receive(:shell_out).with("dscl . -cmd /Path arg1 arg2")
     @provider.dscl("cmd", "/Path", "arg1", "arg2")
   end
 
@@ -129,15 +126,15 @@ describe Chef::Provider::Group::Dscl do
     end
 
     it "should return true for a used gid number" do
-      expect(@provider.gid_used?(500)).to be_true
+      expect(@provider.gid_used?(500)).to be_truthy
     end
 
     it "should return false for an unused gid number" do
-      expect(@provider.gid_used?(501)).to be_false
+      expect(@provider.gid_used?(501)).to be_falsey
     end
 
     it "should return false if not given any valid gid number" do
-      expect(@provider.gid_used?(nil)).to be_false
+      expect(@provider.gid_used?(nil)).to be_falsey
     end
   end
 

data/spec/unit/provider/group_spec.rb

@@ -45,7 +45,7 @@ describe Chef::Provider::User do
   end
 
   it "assumes the group exists by default" do
-    expect(@provider.group_exists).to be_true
+    expect(@provider.group_exists).to be_truthy
   end
 
   describe "when establishing the current state of the group" do
@@ -76,7 +76,7 @@ describe Chef::Provider::User do
     it "should flip the value of exists if it cannot be found in /etc/group" do
       allow(Etc).to receive(:getgrnam).and_raise(ArgumentError)
       @provider.load_current_resource
-      expect(@provider.group_exists).to be_false
+      expect(@provider.group_exists).to be_falsey
     end
 
     it "should return the current resource" do
@@ -88,42 +88,42 @@ describe Chef::Provider::User do
     [ :gid, :members ].each do |attribute|
       it "should return true if #{attribute} doesn't match" do
         allow(@current_resource).to receive(attribute).and_return("looooooooooooooooooool")
-        expect(@provider.compare_group).to be_true
+        expect(@provider.compare_group).to be_truthy
       end
     end
 
     it "should return false if gid and members are equal" do
-      expect(@provider.compare_group).to be_false
+      expect(@provider.compare_group).to be_falsey
     end
 
     it "should coerce an integer to a string for comparison" do
       allow(@current_resource).to receive(:gid).and_return("500")
-      expect(@provider.compare_group).to be_false
+      expect(@provider.compare_group).to be_falsey
     end
 
     it "should return false if append is true and the group member(s) already exists" do
       @current_resource.members << "extra_user"
       allow(@new_resource).to receive(:append).and_return(true)
-      expect(@provider.compare_group).to be_false
+      expect(@provider.compare_group).to be_falsey
     end
 
     it "should return true if append is true and the group member(s) do not already exist" do
       @new_resource.members << "extra_user"
       allow(@new_resource).to receive(:append).and_return(true)
-      expect(@provider.compare_group).to be_true
+      expect(@provider.compare_group).to be_truthy
     end
 
     it "should return false if append is true and excluded_members include a non existing member" do
       @new_resource.excluded_members << "extra_user"
       allow(@new_resource).to receive(:append).and_return(true)
-      expect(@provider.compare_group).to be_false
+      expect(@provider.compare_group).to be_falsey
     end
 
     it "should return true if the append is true and excluded_members include an existing user" do
       @new_resource.members.each {|m| @new_resource.excluded_members << m }
       @new_resource.members.clear
       allow(@new_resource).to receive(:append).and_return(true)
-      expect(@provider.compare_group).to be_true
+      expect(@provider.compare_group).to be_truthy
     end
 
   end
@@ -259,26 +259,26 @@ describe Chef::Provider::User do
        @new_resource.members << "user1"
        @new_resource.members << "user2"
        allow(@new_resource).to receive(:append).and_return true
-       expect(@provider.compare_group).to be_true
+       expect(@provider.compare_group).to be_truthy
        expect(@provider.change_desc).to eq([ "add missing member(s): user1, user2" ])
     end
 
     it "should report that the group members will be overwritten if not appending" do
        @new_resource.members << "user1"
        allow(@new_resource).to receive(:append).and_return false
-       expect(@provider.compare_group).to be_true
+       expect(@provider.compare_group).to be_truthy
        expect(@provider.change_desc).to eq([ "replace group members with new list of members" ])
     end
 
     it "should report the gid will be changed when it does not match" do
       allow(@current_resource).to receive(:gid).and_return("BADF00D")
-      expect(@provider.compare_group).to be_true
+      expect(@provider.compare_group).to be_truthy
       expect(@provider.change_desc).to eq([ "change gid #{@current_resource.gid} to #{@new_resource.gid}" ])
 
     end
 
     it "should report no change reason when no change is required" do
-      expect(@provider.compare_group).to be_false
+      expect(@provider.compare_group).to be_falsey
       expect(@provider.change_desc).to eq([ ])
     end
   end

data/spec/unit/provider/ifconfig/aix_spec.rb

@@ -49,10 +49,11 @@ IFCONFIG
 
   describe "#load_current_resource" do
     before do
-      status = double("Status", :exitstatus => 0)
-      expect(@provider).to receive(:popen4).with("ifconfig -a").and_yield(@pid,@stdin,StringIO.new(@ifconfig_output),@stderr).and_return(status)
+      @status = double(:stdout => @ifconfig_output, :exitstatus => 0)
+      allow(@provider).to receive(:shell_out).and_return(@status)
       @new_resource.device "en0"
     end
+
     it "should load given interface with attributes." do
       current_resource = @provider.load_current_resource
       expect(current_resource.inet_addr).to eq("172.29.174.58")

data/spec/unit/provider/ifconfig/debian_spec.rb

@@ -77,29 +77,29 @@ describe Chef::Provider::Ifconfig::Debian do
       context "when the interface_dot_d directory does not exist" do
         before do
           FileUtils.rmdir tempdir_path
-          expect(File.exists?(tempdir_path)).to be_false
+          expect(File.exists?(tempdir_path)).to be_falsey
         end
 
         it "should create the /etc/network/interfaces.d directory" do
           provider.run_action(:add)
-          expect(File.exists?(tempdir_path)).to be_true
-          expect(File.directory?(tempdir_path)).to be_true
+          expect(File.exists?(tempdir_path)).to be_truthy
+          expect(File.directory?(tempdir_path)).to be_truthy
         end
 
         it "should mark the resource as updated" do
           provider.run_action(:add)
-          expect(new_resource.updated_by_last_action?).to be_true
+          expect(new_resource.updated_by_last_action?).to be_truthy
         end
       end
 
       context "when the interface_dot_d directory exists" do
         before do
-          expect(File.exists?(tempdir_path)).to be_true
+          expect(File.exists?(tempdir_path)).to be_truthy
         end
 
         it "should still mark the resource as updated (we still write a file to it)" do
           provider.run_action(:add)
-          expect(new_resource.updated_by_last_action?).to be_true
+          expect(new_resource.updated_by_last_action?).to be_truthy
         end
       end
     end
@@ -120,7 +120,7 @@ iface eth0 inet static
   netmask 255.255.254.0
 EOF
         )
-        expect(File.exists?(tempdir_path)).to be_true  # since the file exists, the enclosing dir must also exist
+        expect(File.exists?(tempdir_path)).to be_truthy  # since the file exists, the enclosing dir must also exist
       end
 
       context "when the /etc/network/interfaces file has the source line" do
@@ -147,7 +147,7 @@ EOF
         it "should not mark the resource as updated" do
           provider.run_action(:add)
           pending "superclass ifconfig provider is not idempotent"
-          expect(new_resource.updated_by_last_action?).to be_false
+          expect(new_resource.updated_by_last_action?).to be_falsey
         end
       end
 
@@ -175,7 +175,7 @@ EOF
 
         it "should mark the resource as updated" do
           provider.run_action(:add)
-          expect(new_resource.updated_by_last_action?).to be_true
+          expect(new_resource.updated_by_last_action?).to be_truthy
         end
       end
     end
@@ -215,28 +215,28 @@ EOF
         context "when the interface_dot_d directory does not exist" do
           before do
             FileUtils.rmdir tempdir_path
-            expect(File.exists?(tempdir_path)).to be_false
+            expect(File.exists?(tempdir_path)).to be_falsey
           end
 
           it "should not create the /etc/network/interfaces.d directory" do
             provider.run_action(:add)
-            expect(File.exists?(tempdir_path)).not_to be_true
+            expect(File.exists?(tempdir_path)).not_to be_truthy
           end
 
           it "should mark the resource as updated" do
             provider.run_action(:add)
-            expect(new_resource.updated_by_last_action?).to be_true
+            expect(new_resource.updated_by_last_action?).to be_truthy
           end
         end
 
         context "when the interface_dot_d directory exists" do
           before do
-            expect(File.exists?(tempdir_path)).to be_true
+            expect(File.exists?(tempdir_path)).to be_truthy
           end
 
           it "should still mark the resource as updated (we still write a file to it)" do
             provider.run_action(:add)
-            expect(new_resource.updated_by_last_action?).to be_true
+            expect(new_resource.updated_by_last_action?).to be_truthy
           end
         end
       end
@@ -258,7 +258,7 @@ iface eth0 inet static
                                            EOF
                                           )
           expect(File).not_to receive(:new).with(config_filename_ifcfg, "w")
-          expect(File.exists?(tempdir_path)).to be_true  # since the file exists, the enclosing dir must also exist
+          expect(File.exists?(tempdir_path)).to be_truthy  # since the file exists, the enclosing dir must also exist
         end
 
         context "when the /etc/network/interfaces file has the source line" do
@@ -283,7 +283,7 @@ another line
           it "should not mark the resource as updated" do
             provider.run_action(:add)
             pending "superclass ifconfig provider is not idempotent"
-            expect(new_resource.updated_by_last_action?).to be_false
+            expect(new_resource.updated_by_last_action?).to be_falsey
           end
         end
 
@@ -308,7 +308,7 @@ source #{tempdir_path}/*
 
           it "should mark the resource as updated" do
             provider.run_action(:add)
-            expect(new_resource.updated_by_last_action?).to be_true
+            expect(new_resource.updated_by_last_action?).to be_truthy
           end
         end
       end
@@ -345,9 +345,9 @@ source #{tempdir_path}/*
       # internal implementation detail of Ifconfig.
       expect_any_instance_of(Chef::Provider::File).to receive(:action_delete).and_call_original
 
-      expect(File.exist?(config_filename_ifcfg)).to be_true
+      expect(File.exist?(config_filename_ifcfg)).to be_truthy
       provider.run_action(:delete)
-      expect(File.exist?(config_filename_ifcfg)).to be_false
+      expect(File.exist?(config_filename_ifcfg)).to be_falsey
     end
   end
 

data/spec/unit/provider/ifconfig_spec.rb

@@ -42,8 +42,8 @@ describe Chef::Provider::Ifconfig do
  end
   describe Chef::Provider::Ifconfig, "load_current_resource" do
     before do
-      status = double("Status", :exitstatus => 1)
-      expect(@provider).to receive(:popen4).and_return status
+      @status = double(:stdout => "", :exitstatus => 1)
+      allow(@provider).to receive(:shell_out).and_return(@status)
       @provider.load_current_resource
     end
     it "should track state of ifconfig failure." do

data/spec/unit/provider/mdadm_spec.rb

@@ -41,13 +41,13 @@ describe Chef::Provider::Mdadm do
     it "determines that the metadevice exists when mdadm exit code is zero" do
       allow(@provider).to receive(:shell_out!).with("mdadm --detail --test /dev/md1", :returns => [0,4]).and_return(OpenStruct.new(:status => 0))
       @provider.load_current_resource
-      expect(@provider.current_resource.exists).to be_true
+      expect(@provider.current_resource.exists).to be_truthy
     end
 
     it "determines that the metadevice does not exist when mdadm exit code is 4" do
       allow(@provider).to receive(:shell_out!).with("mdadm --detail --test /dev/md1", :returns => [0,4]).and_return(OpenStruct.new(:status => 4))
       @provider.load_current_resource
-      expect(@provider.current_resource.exists).to be_false
+      expect(@provider.current_resource.exists).to be_falsey
     end
   end
 

data/spec/unit/provider/mount/aix_spec.rb

@@ -84,7 +84,7 @@ ENABLED
       stub_mounted_enabled(@provider, @mounted_output, "")
       @provider.load_current_resource
 
-      expect(@provider.current_resource.mounted).to be_true
+      expect(@provider.current_resource.mounted).to be_truthy
     end
 
     it "should set current_resource.mounted to false if device is not mounted" do
@@ -92,7 +92,7 @@ ENABLED
 
       @provider.load_current_resource
 
-      expect(@provider.current_resource.mounted).to be_false
+      expect(@provider.current_resource.mounted).to be_falsey
     end
 
     it "should set current_resource.mounted to false if the mount point is used for another device" do
@@ -100,7 +100,7 @@ ENABLED
 
       @provider.load_current_resource
 
-      expect(@provider.current_resource.mounted).to be_false
+      expect(@provider.current_resource.mounted).to be_falsey
     end
   end
 
@@ -110,8 +110,8 @@ ENABLED
 
     @provider.load_current_resource
 
-    expect(@provider.current_resource.enabled).to be_true
-    expect(@provider.current_resource.mounted).to be_true
+    expect(@provider.current_resource.enabled).to be_truthy
+    expect(@provider.current_resource.mounted).to be_truthy
     expect(@provider.current_resource.mount_point).to eql(@new_resource.mount_point)
     expect(@provider.current_resource.fstype).to eql("jfs2")
     expect(@provider.current_resource.options).to eql(['rw'])

data/spec/unit/provider/mount/mount_spec.rb

@@ -54,10 +54,11 @@ describe Chef::Provider::Mount::Mount do
     end
 
     it "should accecpt device_type :uuid", :not_supported_on_solaris do
+      @status = double(:stdout => "/dev/sdz1\n", :exitstatus => 1)
       @new_resource.device_type :uuid
       @new_resource.device "d21afe51-a0fe-4dc6-9152-ac733763ae0a"
       @stdout_findfs = double("STDOUT", :first => "/dev/sdz1")
-      expect(@provider).to receive(:popen4).with("/sbin/findfs UUID=d21afe51-a0fe-4dc6-9152-ac733763ae0a").and_yield(@pid,@stdin,@stdout_findfs,@stderr).and_return(@status)
+      expect(@provider).to receive(:shell_out).with("/sbin/findfs UUID=d21afe51-a0fe-4dc6-9152-ac733763ae0a").and_return(@status)
       @provider.load_current_resource()
       @provider.mountable?
     end
@@ -67,14 +68,14 @@ describe Chef::Provider::Mount::Mount do
         "cifs" => "//cifsserver/share" }.each do |type, fs_spec|
         it "should detect network fs_spec (#{type})" do
           @new_resource.device fs_spec
-          expect(@provider.network_device?).to be_true
+          expect(@provider.network_device?).to be_truthy
         end
 
         it "should ignore trailing slash and set mounted to true for network mount (#{type})" do
           @new_resource.device fs_spec
           allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(:stdout => "#{fs_spec}/ on /tmp/foo type #{type} (rw)\n"))
           @provider.load_current_resource
-          expect(@provider.current_resource.mounted).to be_true
+          expect(@provider.current_resource.mounted).to be_truthy
         end
       end
     end
@@ -93,11 +94,10 @@ describe Chef::Provider::Mount::Mount do
     end
 
     it "should raise an error if the mount device (uuid) does not exist", :not_supported_on_solaris do
+      status = double(:stdout => "", :exitstatus => 1)
       @new_resource.device_type :uuid
       @new_resource.device "d21afe51-a0fe-4dc6-9152-ac733763ae0a"
-      status_findfs = double("Status", :exitstatus => 1)
-      stdout_findfs = double("STDOUT", :first => nil)
-      expect(@provider).to receive(:popen4).with("/sbin/findfs UUID=d21afe51-a0fe-4dc6-9152-ac733763ae0a").and_yield(@pid,@stdin,stdout_findfs,@stderr).and_return(status_findfs)
+      expect(@provider).to receive(:shell_out).with("/sbin/findfs UUID=d21afe51-a0fe-4dc6-9152-ac733763ae0a").and_return(status)
       expect(::File).to receive(:exists?).with("").and_return(false)
       expect { @provider.load_current_resource();@provider.mountable? }.to raise_error(Chef::Exceptions::Mount)
     end
@@ -123,13 +123,13 @@ describe Chef::Provider::Mount::Mount do
     it "should set mounted true if the mount point is found in the mounts list" do
       allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(:stdout => "/dev/sdz1 on /tmp/foo type ext3 (rw)\n"))
       @provider.load_current_resource()
-      expect(@provider.current_resource.mounted).to be_true
+      expect(@provider.current_resource.mounted).to be_truthy
     end
 
     it "should set mounted false if another mount point beginning with the same path is found in the mounts list" do
       allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(:stdout => "/dev/sdz1 on /tmp/foobar type ext3 (rw)\n"))
       @provider.load_current_resource()
-      expect(@provider.current_resource.mounted).to be_false
+      expect(@provider.current_resource.mounted).to be_falsey
     end
 
     it "should set mounted true if the symlink target of the device is found in the mounts list" do
@@ -141,7 +141,7 @@ describe Chef::Provider::Mount::Mount do
 
       allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(:stdout => "#{target} on /tmp/foo type ext3 (rw)\n"))
       @provider.load_current_resource()
-      expect(@provider.current_resource.mounted).to be_true
+      expect(@provider.current_resource.mounted).to be_truthy
     end
 
     it "should set mounted true if the symlink target of the device is relative and is found in the mounts list - CHEF-4957" do
@@ -155,7 +155,7 @@ describe Chef::Provider::Mount::Mount do
 
       allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(:stdout => "#{absolute_target} on /tmp/foo type ext3 (rw)\n"))
       @provider.load_current_resource()
-      expect(@provider.current_resource.mounted).to be_true
+      expect(@provider.current_resource.mounted).to be_truthy
     end
 
     it "should set mounted true if the mount point is found last in the mounts list" do
@@ -164,7 +164,7 @@ describe Chef::Provider::Mount::Mount do
 
       allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(:stdout => mount))
       @provider.load_current_resource()
-      expect(@provider.current_resource.mounted).to be_true
+      expect(@provider.current_resource.mounted).to be_truthy
     end
 
     it "should set mounted false if the mount point is not last in the mounts list" do
@@ -173,13 +173,13 @@ describe Chef::Provider::Mount::Mount do
 
       allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(:stdout => mount))
       @provider.load_current_resource()
-      expect(@provider.current_resource.mounted).to be_false
+      expect(@provider.current_resource.mounted).to be_falsey
     end
 
     it "mounted should be false if the mount point is not found in the mounts list" do
       allow(@provider).to receive(:shell_out!).and_return(OpenStruct.new(:stdout => "/dev/sdy1 on /tmp/foo type ext3 (rw)\n"))
       @provider.load_current_resource()
-      expect(@provider.current_resource.mounted).to be_false
+      expect(@provider.current_resource.mounted).to be_falsey
     end
 
     it "should set enabled to true if the mount point is last in fstab" do
@@ -189,7 +189,7 @@ describe Chef::Provider::Mount::Mount do
       allow(::File).to receive(:foreach).with("/etc/fstab").and_yield(fstab1).and_yield(fstab2)
 
       @provider.load_current_resource
-      expect(@provider.current_resource.enabled).to be_true
+      expect(@provider.current_resource.enabled).to be_truthy
     end
 
     it "should set enabled to true if the mount point is not last in fstab and mount_point is a substring of another mount" do
@@ -199,7 +199,7 @@ describe Chef::Provider::Mount::Mount do
       allow(::File).to receive(:foreach).with("/etc/fstab").and_yield(fstab1).and_yield(fstab2)
 
       @provider.load_current_resource
-      expect(@provider.current_resource.enabled).to be_true
+      expect(@provider.current_resource.enabled).to be_truthy
     end
 
     it "should set enabled to true if the symlink target is in fstab" do
@@ -213,7 +213,7 @@ describe Chef::Provider::Mount::Mount do
       allow(::File).to receive(:foreach).with("/etc/fstab").and_yield fstab
 
       @provider.load_current_resource
-      expect(@provider.current_resource.enabled).to be_true
+      expect(@provider.current_resource.enabled).to be_truthy
     end
 
     it "should set enabled to true if the symlink target is relative and is in fstab - CHEF-4957" do
@@ -227,7 +227,7 @@ describe Chef::Provider::Mount::Mount do
       allow(::File).to receive(:foreach).with("/etc/fstab").and_yield fstab
 
       @provider.load_current_resource
-      expect(@provider.current_resource.enabled).to be_true
+      expect(@provider.current_resource.enabled).to be_truthy
     end
 
     it "should set enabled to false if the mount point is not in fstab" do
@@ -235,7 +235,7 @@ describe Chef::Provider::Mount::Mount do
       allow(::File).to receive(:foreach).with("/etc/fstab").and_yield fstab
 
       @provider.load_current_resource
-      expect(@provider.current_resource.enabled).to be_false
+      expect(@provider.current_resource.enabled).to be_falsey
     end
 
     it "should ignore commented lines in fstab " do
@@ -243,7 +243,7 @@ describe Chef::Provider::Mount::Mount do
        allow(::File).to receive(:foreach).with("/etc/fstab").and_yield fstab
 
        @provider.load_current_resource
-       expect(@provider.current_resource.enabled).to be_false
+       expect(@provider.current_resource.enabled).to be_falsey
      end
 
     it "should set enabled to false if the mount point is not last in fstab" do
@@ -252,7 +252,7 @@ describe Chef::Provider::Mount::Mount do
       allow(::File).to receive(:foreach).with("/etc/fstab").and_yield(line_1).and_yield(line_2)
 
       @provider.load_current_resource
-      expect(@provider.current_resource.enabled).to be_false
+      expect(@provider.current_resource.enabled).to be_falsey
     end
 
     it "should not mangle the mount options if the device in fstab is a symlink" do
@@ -307,10 +307,10 @@ describe Chef::Provider::Mount::Mount do
       end
 
       it "should mount the filesystem specified by uuid", :not_supported_on_solaris do
+        status = double(:stdout => "/dev/sdz1\n", :exitstatus => 1)
         @new_resource.device "d21afe51-a0fe-4dc6-9152-ac733763ae0a"
         @new_resource.device_type :uuid
-        @stdout_findfs = double("STDOUT", :first => "/dev/sdz1")
-        allow(@provider).to receive(:popen4).with("/sbin/findfs UUID=d21afe51-a0fe-4dc6-9152-ac733763ae0a").and_yield(@pid,@stdin,@stdout_findfs,@stderr).and_return(@status)
+        allow(@provider).to receive(:shell_out).with("/sbin/findfs UUID=d21afe51-a0fe-4dc6-9152-ac733763ae0a").and_return(status)
         @stdout_mock = double('stdout mock')
         allow(@stdout_mock).to receive(:each).and_yield("#{@new_resource.device} on #{@new_resource.mount_point}")
         expect(@provider).to receive(:shell_out!).with("mount -t #{@new_resource.fstype} -o defaults -U #{@new_resource.device} #{@new_resource.mount_point}").and_return(@stdout_mock)