chef 12.0.0.alpha.0 → 12.0.0.alpha.1

data/spec/unit/provider/log_spec.rb

@@ -20,80 +20,60 @@ require 'spec_helper'
 
 describe Chef::Provider::Log::ChefLog do
 
-  before(:each) do
-    @log_str = "this is my test string to log"
-    @node = Chef::Node.new
-    @events = Chef::EventDispatch::Dispatcher.new
-    @run_context = Chef::RunContext.new(@node, {}, @events)
-  end
+  let(:log_str) { "this is my test string to log" }
+
+  let(:node) { Chef::Node.new }
+
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+
+  let(:new_resource) { Chef::Resource::Log.new(log_str) }
+
+  let(:provider) { Chef::Provider::Log::ChefLog.new(new_resource, run_context) }
 
   it "should be registered with the default platform hash" do
-    Chef::Platform.platforms[:default][:log].should_not be_nil
+    expect(Chef::Platform.platforms[:default][:log]).not_to be_nil
   end
 
   it "should write the string to the Chef::Log object at default level (info)" do
-      @new_resource = Chef::Resource::Log.new(@log_str)
-      @provider = Chef::Provider::Log::ChefLog.new(@new_resource, @run_context)
-      Chef::Log.should_receive(:info).with(@log_str).and_return(true)
-      @provider.action_write
+    expect(Chef::Log).to receive(:info).with(log_str).and_return(true)
+    provider.run_action(:write)
   end
 
   it "should write the string to the Chef::Log object at debug level" do
-      @new_resource = Chef::Resource::Log.new(@log_str)
-      @new_resource.level :debug
-      @provider = Chef::Provider::Log::ChefLog.new(@new_resource, @run_context)
-      Chef::Log.should_receive(:debug).with(@log_str).and_return(true)
-      @provider.action_write
+    new_resource.level :debug
+    expect(Chef::Log).to receive(:debug).with(log_str).and_return(true)
+    provider.run_action(:write)
   end
 
   it "should write the string to the Chef::Log object at info level" do
-      @new_resource = Chef::Resource::Log.new(@log_str)
-      @new_resource.level :info
-      @provider = Chef::Provider::Log::ChefLog.new(@new_resource, @run_context)
-      Chef::Log.should_receive(:info).with(@log_str).and_return(true)
-      @provider.action_write
+    new_resource.level :info
+    expect(Chef::Log).to receive(:info).with(log_str).and_return(true)
+    provider.run_action(:write)
   end
 
   it "should write the string to the Chef::Log object at warn level" do
-      @new_resource = Chef::Resource::Log.new(@log_str)
-      @new_resource.level :warn
-      @provider = Chef::Provider::Log::ChefLog.new(@new_resource, @run_context)
-      Chef::Log.should_receive(:warn).with(@log_str).and_return(true)
-      @provider.action_write
+    new_resource.level :warn
+    expect(Chef::Log).to receive(:warn).with(log_str).and_return(true)
+    provider.run_action(:write)
   end
 
   it "should write the string to the Chef::Log object at error level" do
-      @new_resource = Chef::Resource::Log.new(@log_str)
-      @new_resource.level :error
-      @provider = Chef::Provider::Log::ChefLog.new(@new_resource, @run_context)
-      Chef::Log.should_receive(:error).with(@log_str).and_return(true)
-      @provider.action_write
+    new_resource.level :error
+    expect(Chef::Log).to receive(:error).with(log_str).and_return(true)
+    provider.run_action(:write)
   end
 
   it "should write the string to the Chef::Log object at fatal level" do
-      @new_resource = Chef::Resource::Log.new(@log_str)
-      @new_resource.level :fatal
-      @provider = Chef::Provider::Log::ChefLog.new(@new_resource, @run_context)
-      Chef::Log.should_receive(:fatal).with(@log_str).and_return(true)
-      @provider.action_write
-  end
-
-  it "should not update the resource if the message was not written to the log" do
-      Chef::Log.level = :fatal
-      @new_resource = Chef::Resource::Log.new(@log_str)
-      @new_resource.level :info
-      @provider = Chef::Provider::Log::ChefLog.new(@new_resource, @run_context)
-      @provider.action_write
-      @new_resource.updated.should be_false
+    new_resource.level :fatal
+    expect(Chef::Log).to receive(:fatal).with(log_str).and_return(true)
+    provider.run_action(:write)
   end
 
-  it "should update the resource if the message has been written to the log" do
-      Chef::Log.level = :debug
-      @new_resource = Chef::Resource::Log.new(@log_str)
-      @new_resource.level :info
-      @provider = Chef::Provider::Log::ChefLog.new(@new_resource, @run_context)
-      @provider.action_write
-      @new_resource.updated.should be_true
+  it "should print the string in why-run mode" do
+    Chef::Config[:why_run] = true
+    expect(Chef::Log).to receive(:info).with(log_str).and_return(true)
+    provider.run_action(:write)
   end
-
 end

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

@@ -125,11 +125,17 @@ describe Chef::Provider::Mount::Mount do
     end
 
     it "should set mounted true if the mount point is found in the mounts list" do
-      @provider.stub(:shell_out!).and_return(OpenStruct.new(:stdout => '/dev/sdz1 on /tmp/foo'))
+      @provider.stub(:shell_out!).and_return(OpenStruct.new(:stdout => "/dev/sdz1 on /tmp/foo type ext3 (rw)\n"))
       @provider.load_current_resource()
       @provider.current_resource.mounted.should be_true
     end
 
+    it "should set mounted false if another mount point beginning with the same path is found in the mounts list" do
+      @provider.stub(:shell_out!).and_return(OpenStruct.new(:stdout => "/dev/sdz1 on /tmp/foobar type ext3 (rw)\n"))
+      @provider.load_current_resource()
+      @provider.current_resource.mounted.should be_false
+    end
+
     it "should set mounted true if the symlink target of the device is found in the mounts list" do
       # expand the target path to correct specs on Windows
       target = ::File.expand_path('/dev/mapper/target')
@@ -437,14 +443,17 @@ describe Chef::Provider::Mount::Mount do
         @current_resource.stub(:enabled).and_return(true)
         fstab_read = ["/dev/sdz1 /tmp/foo  ext3  defaults  1 2\n",
                       "/dev/sdy1 /tmp/foo  ext3  defaults  1 2\n",
-                      "/dev/sdz1 /tmp/foo  ext3  defaults  1 2\n"]
+                      "/dev/sdz1 /tmp/foo  ext3  defaults  1 2\n",
+                      "/dev/sdz1 /tmp/foobar  ext3  defaults  1 2\n"]
 
         fstab_write = StringIO.new
         ::File.stub(:readlines).with("/etc/fstab").and_return(fstab_read)
         ::File.stub(:open).with("/etc/fstab", "w").and_yield(fstab_write)
 
         @provider.disable_fs
-        fstab_write.string.should == "/dev/sdz1 /tmp/foo  ext3  defaults  1 2\n/dev/sdy1 /tmp/foo  ext3  defaults  1 2\n"
+        fstab_write.string.should == "/dev/sdz1 /tmp/foo  ext3  defaults  1 2\n" +
+          "/dev/sdy1 /tmp/foo  ext3  defaults  1 2\n" +
+          "/dev/sdz1 /tmp/foobar  ext3  defaults  1 2\n"
       end
 
       it "should not disable if enabled is false" do

data/spec/unit/provider/package/ips_spec.rb

@@ -30,54 +30,70 @@ describe Chef::Provider::Package::Ips do
     @current_resource = Chef::Resource::Package.new("crypto/gnupg", @run_context)
     Chef::Resource::Package.stub(:new).and_return(@current_resource)
     @provider = Chef::Provider::Package::Ips.new(@new_resource, @run_context)
+  end
 
-    @stdin = StringIO.new
-    @stderr = StringIO.new
-    @stdout =<<-PKG_STATUS
-          Name: crypto/gnupg
-       Summary: GNU Privacy Guard
-   Description: A complete and free implementation of the OpenPGP Standard as
-                defined by RFC4880.
-      Category: Applications/System Utilities
-         State: Not installed
-     Publisher: solaris
-       Version: 2.0.17
+  def local_output
+    stdin  = StringIO.new
+    stdout = ''
+    stderr =<<-PKG_STATUS
+pkg: info: no packages matching the following patterns you specified are
+installed on the system.  Try specifying -r to query remotely:
+
+   crypto/gnupg 
+PKG_STATUS
+    return OpenStruct.new(:stdout => stdout,:stdin => stdin,:stderr => stderr,:status => @status,:exitstatus => 1)
+  end
+
+  def remote_output
+
+    stdout = <<-PKG_STATUS
+          Name: security/sudo
+       Summary: sudo - authority delegation tool
+         State: Not Installed
+     Publisher: omnios
+       Version: 1.8.4.1 (1.8.4p1)
  Build Release: 5.11
-        Branch: 0.175.0.0.0.2.537
-Packaging Date: October 19, 2011 09:14:50 AM
-          Size: 8.07 MB
-          FMRI: pkg://solaris/crypto/gnupg@2.0.17,5.11-0.175.0.0.0.2.537:20111019T091450Z
+        Branch: 0.151002
+Packaging Date: April  1, 2012 05:55:52 PM
+          Size: 2.57 MB
+          FMRI: pkg://omnios/security/sudo@1.8.4.1,5.11-0.151002:20120401T175552Z
 PKG_STATUS
-    @pid = 12345
-    @shell_out = OpenStruct.new(:stdout => @stdout,:stdin => @stdin,:stderr => @stderr,:status => @status,:exitstatus => 0)
+  stdin = StringIO.new
+  stderr = '' 
+  return OpenStruct.new(:stdout => stdout,:stdin => stdin,:stderr => stderr,:status => @status,:exitstatus => 0)
   end
 
   context "when loading current resource" do
     it "should create a current resource with the name of the new_resource" do
-      @provider.should_receive(:shell_out!).and_return(@shell_out)
+      @provider.should_receive(:shell_out).with("pkg info #{@new_resource.package_name}").and_return(local_output)
+      @provider.should_receive(:shell_out!).with("pkg info -r #{@new_resource.package_name}").and_return(remote_output)
       Chef::Resource::Package.should_receive(:new).and_return(@current_resource)
       @provider.load_current_resource
     end
 
     it "should set the current resources package name to the new resources package name" do
-      @provider.should_receive(:shell_out!).and_return(@shell_out)
-      @current_resource.should_receive(:package_name).with(@new_resource.package_name)
+      @provider.should_receive(:shell_out).with("pkg info #{@new_resource.package_name}").and_return(local_output)
+      @provider.should_receive(:shell_out!).with("pkg info -r #{@new_resource.package_name}").and_return(remote_output)
       @provider.load_current_resource
+      @current_resource.package_name.should == @new_resource.package_name
     end
 
     it "should run pkg info with the package name" do
-      @provider.should_receive(:shell_out!).with("pkg info -r #{@new_resource.package_name}").and_return(@shell_out)
+      @provider.should_receive(:shell_out).with("pkg info #{@new_resource.package_name}").and_return(local_output)
+      @provider.should_receive(:shell_out!).with("pkg info -r #{@new_resource.package_name}").and_return(remote_output)
       @provider.load_current_resource
     end
 
     it "should set the installed version to nil on the current resource if package state is not installed" do
-      @provider.should_receive(:shell_out!).and_return(@shell_out)
-      @current_resource.should_receive(:version).with(nil).and_return(true)
+      @provider.should_receive(:shell_out).with("pkg info #{@new_resource.package_name}").and_return(local_output)
+      @provider.should_receive(:shell_out!).with("pkg info -r #{@new_resource.package_name}").and_return(remote_output)
       @provider.load_current_resource
+      @current_resource.version.should be_nil
     end
 
     it "should set the installed version if package has one" do
-      @stdout.replace(<<-INSTALLED)
+      local = local_output
+      local.stdout = <<-INSTALLED
           Name: crypto/gnupg
        Summary: GNU Privacy Guard
    Description: A complete and free implementation of the OpenPGP Standard as
@@ -92,14 +108,15 @@ Packaging Date: October 19, 2011 09:14:50 AM
           Size: 8.07 MB
           FMRI: pkg://solaris/crypto/gnupg@2.0.17,5.11-0.175.0.0.0.2.537:20111019T091450Z
 INSTALLED
-      @provider.should_receive(:shell_out!).and_return(@shell_out)
+      @provider.should_receive(:shell_out).with("pkg info #{@new_resource.package_name}").and_return(local)
+      @provider.should_receive(:shell_out!).with("pkg info -r #{@new_resource.package_name}").and_return(remote_output)
       @provider.load_current_resource
       @current_resource.version.should == "2.0.17"
-      @provider.candidate_version.should eql("2.0.17")
     end
 
-    it "should return the current resouce" do
-      @provider.should_receive(:shell_out!).and_return(@shell_out)
+    it "should return the current resource" do
+      @provider.should_receive(:shell_out).with("pkg info #{@new_resource.package_name}").and_return(local_output)
+      @provider.should_receive(:shell_out!).with("pkg info -r #{@new_resource.package_name}").and_return(remote_output)
       @provider.load_current_resource.should eql(@current_resource)
     end
   end
@@ -121,8 +138,9 @@ INSTALLED
       @provider.install_package("crypto/gnupg", "2.0.17")
     end
 
-    it "should not contain invalid characters for the version string" do
-      @stdout.replace(<<-PKG_STATUS)
+    it "should not include the human-readable version in the candidate_version" do
+      remote = remote_output
+      remote.stdout = <<-PKG_STATUS
           Name: security/sudo
        Summary: sudo - authority delegation tool
          State: Not Installed
@@ -134,49 +152,64 @@ Packaging Date: April  1, 2012 05:55:52 PM
           Size: 2.57 MB
           FMRI: pkg://omnios/security/sudo@1.8.4.1,5.11-0.151002:20120401T175552Z
 PKG_STATUS
-      @provider.should_receive(:run_command_with_systems_locale).with({
-          :command => "pkg install -q security/sudo@1.8.4.1"
-      })
-      @provider.install_package("security/sudo", "1.8.4.1")
+      @provider.should_receive(:shell_out).with("pkg info #{@new_resource.package_name}").and_return(local_output)
+      @provider.should_receive(:shell_out!).with("pkg info -r #{@new_resource.package_name}").and_return(remote)
+      @provider.load_current_resource
+      @current_resource.version.should be_nil
+      @provider.candidate_version.should eql("1.8.4.1")
     end
 
-    it "should not include the human-readable version in the candidate_version" do
-      @stdout.replace(<<-PKG_STATUS)
-          Name: security/sudo
-       Summary: sudo - authority delegation tool
+    it "should not upgrade the package if it is already installed" do
+      local = local_output
+      local.stdout = <<-INSTALLED
+          Name: crypto/gnupg
+       Summary: GNU Privacy Guard
+   Description: A complete and free implementation of the OpenPGP Standard as
+                defined by RFC4880.
+      Category: Applications/System Utilities
+         State: Installed
+     Publisher: solaris
+       Version: 2.0.17
+ Build Release: 5.11
+        Branch: 0.175.0.0.0.2.537
+Packaging Date: October 19, 2011 09:14:50 AM
+          Size: 8.07 MB
+          FMRI: pkg://solaris/crypto/gnupg@2.0.17,5.11-0.175.0.0.0.2.537:20111019T091450Z
+INSTALLED
+      remote = remote_output
+      remote.stdout = <<-REMOTE
+          Name: crypto/gnupg
+       Summary: GNU Privacy Guard
+   Description: A complete and free implementation of the OpenPGP Standard as
+                defined by RFC4880.
+      Category: Applications/System Utilities
          State: Not Installed
-     Publisher: omnios
-       Version: 1.8.4.1 (1.8.4p1)
+     Publisher: solaris
+       Version: 2.0.18
  Build Release: 5.11
-        Branch: 0.151002
-Packaging Date: April  1, 2012 05:55:52 PM
-          Size: 2.57 MB
-          FMRI: pkg://omnios/security/sudo@1.8.4.1,5.11-0.151002:20120401T175552Z
-PKG_STATUS
-      @provider.should_receive(:shell_out!).and_return(@shell_out)
+        Branch: 0.175.0.0.0.2.537
+Packaging Date: October 19, 2011 09:14:50 AM
+          Size: 8.07 MB
+          FMRI: pkg://solaris/crypto/gnupg@2.0.18,5.11-0.175.0.0.0.2.537:20111019T091450Z
+REMOTE
+
+      @provider.should_receive(:shell_out).with("pkg info #{@new_resource.package_name}").and_return(local)
+      @provider.should_receive(:shell_out!).with("pkg info -r #{@new_resource.package_name}").and_return(remote)
       @provider.load_current_resource
-      @current_resource.version.should be_nil
-      @provider.candidate_version.should eql("1.8.4.1")
+      @provider.should_receive(:install_package).exactly(0).times
+      @provider.action_install
     end
 
-    context "using the ips_package resource" do
+    context "when accept_license is true" do
       before do
-        @new_resource = Chef::Resource::IpsPackage.new("crypto/gnupg", @run_context)
-        @current_resource = Chef::Resource::IpsPackage.new("crypto/gnupg", @run_context)
-        @provider = Chef::Provider::Package::Ips.new(@new_resource, @run_context)
+        @new_resource.stub(:accept_license).and_return(true)
       end
 
-      context "when accept_license is true" do
-        before do
-          @new_resource.stub(:accept_license).and_return(true)
-        end
-
-        it "should run pkg install with the --accept flag" do
-          @provider.should_receive(:run_command_with_systems_locale).with({
-            :command => "pkg install -q --accept crypto/gnupg@2.0.17"
-          })
-          @provider.install_package("crypto/gnupg", "2.0.17")
-        end
+      it "should run pkg install with the --accept flag" do
+        @provider.should_receive(:run_command_with_systems_locale).with({
+          :command => "pkg install -q --accept crypto/gnupg@2.0.17"
+        })
+        @provider.install_package("crypto/gnupg", "2.0.17")
       end
     end
   end

data/spec/unit/provider/package/paludis_spec.rb

@@ -59,7 +59,7 @@ PKG_STATUS
     end
 
     it "should run pkg info with the package name" do
-      @provider.should_receive(:shell_out!).with("cave -L warning print-ids -m \"*/#{@new_resource.package_name.split('/').last}\" -f \"%c/%p %v %r\n\"").and_return(@shell_out)
+      @provider.should_receive(:shell_out!).with("cave -L warning print-ids -M none -m \"*/#{@new_resource.package_name.split('/').last}\" -f \"%c/%p %v %r\n\"").and_return(@shell_out)
       @provider.load_current_resource
     end
 
@@ -86,13 +86,13 @@ INSTALLED
 
   context "when installing a package" do
     it "should run pkg install with the package name and version" do
-      @provider.should_receive(:shell_out!).with("cave -L warning resolve -x \"=net/ntp-4.2.6_p5-r2\"")
+      @provider.should_receive(:shell_out!).with("cave -L warning resolve -x \"=net/ntp-4.2.6_p5-r2\"", {:timeout=>@new_resource.timeout})
       @provider.install_package("net/ntp", "4.2.6_p5-r2")
     end
 
 
     it "should run pkg install with the package name and version and options if specified" do
-      @provider.should_receive(:shell_out!).with("cave -L warning resolve -x --preserve-world \"=net/ntp-4.2.6_p5-r2\"")
+      @provider.should_receive(:shell_out!).with("cave -L warning resolve -x --preserve-world \"=net/ntp-4.2.6_p5-r2\"", {:timeout=>@new_resource.timeout})
       @new_resource.stub(:options).and_return("--preserve-world")
       @provider.install_package("net/ntp", "4.2.6_p5-r2")
     end
@@ -102,7 +102,7 @@ INSTALLED
 sys-process/lsof 4.87 arbor
 sys-process/lsof 4.87 x86_64
 PKG_STATUS
-      @provider.should_receive(:shell_out!).with("cave -L warning resolve -x \"=sys-process/lsof-4.87\"")
+      @provider.should_receive(:shell_out!).with("cave -L warning resolve -x \"=sys-process/lsof-4.87\"", {:timeout=>@new_resource.timeout})
       @provider.install_package("sys-process/lsof", "4.87")
     end
 
@@ -120,7 +120,7 @@ PKG_STATUS
 
   context "when upgrading a package" do
     it "should run pkg install with the package name and version" do
-      @provider.should_receive(:shell_out!).with("cave -L warning resolve -x \"=net/ntp-4.2.6_p5-r2\"")
+      @provider.should_receive(:shell_out!).with("cave -L warning resolve -x \"=net/ntp-4.2.6_p5-r2\"", {:timeout=>@new_resource.timeout})
       @provider.upgrade_package("net/ntp", "4.2.6_p5-r2")
     end
   end

data/spec/unit/provider/package/rpm_spec.rb

@@ -80,6 +80,18 @@ describe Chef::Provider::Package::Rpm do
       @provider.stub(:popen4).and_return(status)
       lambda { @provider.run_action(:any) }.should raise_error(Chef::Exceptions::Package)
     end
+
+    it "should not detect the package name as version when not installed" do
+      @status = double("Status", :exitstatus => -1)
+      @stdout = StringIO.new("package openssh-askpass is not installed")
+      @new_resource = Chef::Resource::Package.new("openssh-askpass")
+      @new_resource.source 'openssh-askpass'
+      @provider = Chef::Provider::Package::Rpm.new(@new_resource, @run_context)
+      @provider.should_receive(:popen4).with("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' openssh-askpass").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      @provider.should_receive(:popen4).with("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' openssh-askpass").and_return(@status)
+      @provider.load_current_resource
+      @provider.current_resource.version.should be_nil
+    end
   end
 
   describe "after the current resource is loaded" do

data/spec/unit/provider/package/zypper_spec.rb

@@ -146,25 +146,37 @@ describe Chef::Provider::Package::Zypper do
   end
 
   describe "remove_package" do
-    it "should run zypper remove with the package name" do
-      Chef::Config.stub(:[]).with(:zypper_check_gpg).and_return(true)
-      @provider.should_receive(:shell_out!).with(
-        "zypper --non-interactive remove emacs=1.0")
-      @provider.remove_package("emacs", "1.0")
+
+    context "when package version is not explicitly specified" do
+      it "should run zypper remove with the package name" do
+        Chef::Config.stub(:[]).with(:zypper_check_gpg).and_return(true)
+        @provider.should_receive(:shell_out!).with(
+            "zypper --non-interactive remove emacs")
+        @provider.remove_package("emacs", nil)
+      end
     end
-    it "should run zypper remove without gpg checks" do
-      Chef::Config.stub(:[]).with(:zypper_check_gpg).and_return(false)
-      @provider.should_receive(:shell_out!).with(
+
+    context "when package version is explicitly specified" do
+      it "should run zypper remove with the package name" do
+        Chef::Config.stub(:[]).with(:zypper_check_gpg).and_return(true)
+        @provider.should_receive(:shell_out!).with(
+          "zypper --non-interactive remove emacs=1.0")
+        @provider.remove_package("emacs", "1.0")
+      end
+      it "should run zypper remove without gpg checks" do
+        Chef::Config.stub(:[]).with(:zypper_check_gpg).and_return(false)
+        @provider.should_receive(:shell_out!).with(
+            "zypper --non-interactive --no-gpg-checks remove emacs=1.0")
+        @provider.remove_package("emacs", "1.0")
+      end
+      it "should warn about gpg checks on zypper remove" do
+        Chef::Log.should_receive(:warn).with(
+          /All packages will be installed without gpg signature checks/)
+        @provider.should_receive(:shell_out!).with(
           "zypper --non-interactive --no-gpg-checks remove emacs=1.0")
-      @provider.remove_package("emacs", "1.0")
-    end
-    it "should warn about gpg checks on zypper remove" do
-      Chef::Log.should_receive(:warn).with(
-        /All packages will be installed without gpg signature checks/)
-      @provider.should_receive(:shell_out!).with(
-        "zypper --non-interactive --no-gpg-checks remove emacs=1.0")
 
-      @provider.remove_package("emacs", "1.0")
+        @provider.remove_package("emacs", "1.0")
+      end
     end
   end