chef 11.14.0.alpha.4 → 11.14.0.rc.2

data/spec/unit/provider/log_spec.rb

@@ -78,4 +78,22 @@ describe Chef::Provider::Log::ChefLog do
       @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
+  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
+  end
+
 end

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

@@ -19,7 +19,9 @@
 require 'spec_helper'
 require 'ostruct'
 
-describe Chef::Provider::Mount::Solaris do
+# Do not run these tests on windows because some path handling
+# code is not implemented to handle windows paths.
+describe Chef::Provider::Mount::Solaris, :unix_only do
   let(:node) { Chef::Node.new }
 
   let(:events) { Chef::EventDispatch::Dispatcher.new }

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

@@ -39,12 +39,16 @@ irssi:
 PKG_STATUS
     @stderr = ""
     @shell_out = OpenStruct.new(:stdout => @stdout,:stdin => @stdin,:stderr => @stderr,:status => @status,:exitstatus => 0)
+    @timeout = 900
   end
 
   describe "when loading current resource" do
 
     it "should create a current resource with the name of the new_resource" do
-      @provider.should_receive(:shell_out!).with("apt-cache policy #{@new_resource.package_name}").and_return(@shell_out)
+      @provider.should_receive(:shell_out!).with(
+        "apt-cache policy #{@new_resource.package_name}",
+        :timeout => @timeout
+      ).and_return(@shell_out)
       @provider.load_current_resource
 
       current_resource = @provider.current_resource
@@ -84,7 +88,10 @@ libmysqlclient15-dev:
   Version table:
 VPKG_STDOUT
       virtual_package = double(:stdout => virtual_package_out,:exitstatus => 0)
-      @provider.should_receive(:shell_out!).with("apt-cache policy libmysqlclient15-dev").and_return(virtual_package)
+      @provider.should_receive(:shell_out!).with(
+        "apt-cache policy libmysqlclient15-dev",
+        :timeout => @timeout
+      ).and_return(virtual_package)
       showpkg_out =<<-SHOWPKG_STDOUT
 Package: libmysqlclient15-dev
 Versions:
@@ -104,7 +111,10 @@ libmysqlclient-dev 5.1.41-3ubuntu12.10
 libmysqlclient-dev 5.1.41-3ubuntu12
 SHOWPKG_STDOUT
       showpkg = double(:stdout => showpkg_out,:exitstatus => 0)
-      @provider.should_receive(:shell_out!).with("apt-cache showpkg libmysqlclient15-dev").and_return(showpkg)
+      @provider.should_receive(:shell_out!).with(
+        "apt-cache showpkg libmysqlclient15-dev",
+        :timeout => @timeout
+      ).and_return(showpkg)
       real_package_out=<<-RPKG_STDOUT
 libmysqlclient-dev:
   Installed: 5.1.41-3ubuntu12.10
@@ -119,7 +129,10 @@ libmysqlclient-dev:
         500 http://us.archive.ubuntu.com/ubuntu/ lucid/main Packages
 RPKG_STDOUT
       real_package = double(:stdout => real_package_out,:exitstatus => 0)
-      @provider.should_receive(:shell_out!).with("apt-cache policy libmysqlclient-dev").and_return(real_package)
+      @provider.should_receive(:shell_out!).with(
+        "apt-cache policy libmysqlclient-dev",
+        :timeout => @timeout
+      ).and_return(real_package)
       @provider.load_current_resource
     end
 
@@ -132,7 +145,10 @@ mp3-decoder:
   Version table:
 VPKG_STDOUT
       virtual_package = double(:stdout => virtual_package_out,:exitstatus => 0)
-      @provider.should_receive(:shell_out!).with("apt-cache policy mp3-decoder").and_return(virtual_package)
+      @provider.should_receive(:shell_out!).with(
+        "apt-cache policy mp3-decoder",
+        :timeout => @timeout
+      ).and_return(virtual_package)
       showpkg_out=<<-SHOWPKG_STDOUT
 Package: mp3-decoder
 Versions:
@@ -155,7 +171,10 @@ mpg321 0.2.10.6
 mpg123 1.12.1-0ubuntu1
 SHOWPKG_STDOUT
       showpkg = double(:stdout => showpkg_out,:exitstatus => 0)
-      @provider.should_receive(:shell_out!).with("apt-cache showpkg mp3-decoder").and_return(showpkg)
+      @provider.should_receive(:shell_out!).with(
+        "apt-cache showpkg mp3-decoder",
+        :timeout => @timeout
+      ).and_return(showpkg)
       lambda { @provider.load_current_resource }.should raise_error(Chef::Exceptions::Package)
     end
 
@@ -165,13 +184,17 @@ SHOWPKG_STDOUT
 
       @new_resource.stub(:default_release).and_return("lenny-backports")
       @new_resource.stub(:provider).and_return("Chef::Provider::Package::Apt")
-      @provider.should_receive(:shell_out!).with("apt-cache -o APT::Default-Release=lenny-backports policy irssi").and_return(@shell_out)
+      @provider.should_receive(:shell_out!).with(
+        "apt-cache -o APT::Default-Release=lenny-backports policy irssi",
+        :timeout => @timeout
+      ).and_return(@shell_out)
       @provider.load_current_resource
     end
 
     it "raises an exception if a source is specified (CHEF-5113)" do
       @new_resource.source "pluto"
       @provider.define_resource_requirements
+      @provider.should_receive(:shell_out!).with("apt-cache policy irssi", {:timeout=>900}).and_return(@shell_out)
       expect { @provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package)
     end
   end
@@ -184,16 +207,20 @@ SHOWPKG_STDOUT
 
     describe "install_package" do
       it "should run apt-get install with the package name and version" do
-        @provider.should_receive(:shell_out!).
-          with("apt-get -q -y install irssi=0.8.12-7",
-               :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil})
+        @provider.should_receive(:shell_out!). with(
+          "apt-get -q -y install irssi=0.8.12-7",
+          :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil},
+          :timeout => @timeout
+        )
         @provider.install_package("irssi", "0.8.12-7")
       end
 
       it "should run apt-get install with the package name and version and options if specified" do
-        @provider.should_receive(:shell_out!).
-          with("apt-get -q -y --force-yes install irssi=0.8.12-7",
-               :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil })
+        @provider.should_receive(:shell_out!).with(
+          "apt-get -q -y --force-yes install irssi=0.8.12-7",
+          :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil },
+          :timeout => @timeout
+        )
         @new_resource.options("--force-yes")
         @provider.install_package("irssi", "0.8.12-7")
       end
@@ -205,9 +232,11 @@ SHOWPKG_STDOUT
 
         @provider.new_resource = @new_resource
 
-        @provider.should_receive(:shell_out!).
-          with("apt-get -q -y -o APT::Default-Release=lenny-backports install irssi=0.8.12-7",
-                :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil })
+        @provider.should_receive(:shell_out!).with(
+          "apt-get -q -y -o APT::Default-Release=lenny-backports install irssi=0.8.12-7",
+          :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil },
+          :timeout => @timeout
+        )
 
         @provider.install_package("irssi", "0.8.12-7")
       end
@@ -224,16 +253,20 @@ SHOWPKG_STDOUT
     describe Chef::Provider::Package::Apt, "remove_package" do
 
       it "should run apt-get remove with the package name" do
-        @provider.should_receive(:shell_out!).
-          with("apt-get -q -y remove irssi",
-               :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil})
+        @provider.should_receive(:shell_out!).with(
+          "apt-get -q -y remove irssi",
+          :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil},
+          :timeout => @timeout
+        )
         @provider.remove_package("irssi", "0.8.12-7")
       end
 
       it "should run apt-get remove with the package name and options if specified" do
-        @provider.should_receive(:shell_out!).
-          with("apt-get -q -y --force-yes remove irssi",
-               :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil })
+        @provider.should_receive(:shell_out!).with(
+          "apt-get -q -y --force-yes remove irssi",
+          :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil },
+          :timeout => @timeout
+        )
         @new_resource.options("--force-yes")
 
         @provider.remove_package("irssi", "0.8.12-7")
@@ -243,16 +276,20 @@ SHOWPKG_STDOUT
     describe "when purging a package" do
 
       it "should run apt-get purge with the package name" do
-        @provider.should_receive(:shell_out!).
-          with("apt-get -q -y purge irssi",
-               :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil })
+        @provider.should_receive(:shell_out!).with(
+          "apt-get -q -y purge irssi",
+          :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil },
+          :timeout => @timeout
+        )
         @provider.purge_package("irssi", "0.8.12-7")
       end
 
       it "should run apt-get purge with the package name and options if specified" do
-        @provider.should_receive(:shell_out!).
-          with("apt-get -q -y --force-yes purge irssi",
-          :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil })
+        @provider.should_receive(:shell_out!).with(
+          "apt-get -q -y --force-yes purge irssi",
+          :env => { "DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil },
+          :timeout => @timeout
+        )
         @new_resource.options("--force-yes")
 
         @provider.purge_package("irssi", "0.8.12-7")
@@ -268,17 +305,21 @@ SHOWPKG_STDOUT
         @provider.should_receive(:get_preseed_file).with("irssi", "0.8.12-7").and_return("/tmp/irssi-0.8.12-7.seed")
         file = @provider.get_preseed_file("irssi", "0.8.12-7")
 
-        @provider.should_receive(:shell_out!).
-          with("debconf-set-selections /tmp/irssi-0.8.12-7.seed",
-          :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil})
+        @provider.should_receive(:shell_out!).with(
+          "debconf-set-selections /tmp/irssi-0.8.12-7.seed",
+          :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil},
+          :timeout => @timeout
+        )
 
         @provider.preseed_package(file)
       end
 
       it "should run debconf-set-selections on the preseed file if it has changed" do
-        @provider.should_receive(:shell_out!).
-          with("debconf-set-selections /tmp/irssi-0.8.12-7.seed",
-          :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil})
+        @provider.should_receive(:shell_out!).with(
+          "debconf-set-selections /tmp/irssi-0.8.12-7.seed",
+          :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil},
+          :timeout => @timeout
+        )
         file = @provider.get_preseed_file("irssi", "0.8.12-7")
         @provider.preseed_package(file)
       end
@@ -295,9 +336,11 @@ SHOWPKG_STDOUT
 
     describe "when reconfiguring a package" do
       it "should run dpkg-reconfigure package" do
-        @provider.should_receive(:shell_out!).
-          with("dpkg-reconfigure irssi",
-          :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil })
+        @provider.should_receive(:shell_out!).with(
+          "dpkg-reconfigure irssi",
+          :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil },
+          :timeout => @timeout
+        )
         @provider.reconfig_package("irssi", "0.8.12-7")
       end
     end
@@ -305,9 +348,11 @@ SHOWPKG_STDOUT
     describe "when installing a virtual package" do
       it "should install the package without specifying a version" do
           @provider.is_virtual_package = true
-          @provider.should_receive(:shell_out!).
-            with("apt-get -q -y install libmysqlclient-dev",
-                 :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil })
+          @provider.should_receive(:shell_out!).with(
+            "apt-get -q -y install libmysqlclient-dev",
+            :env => {"DEBIAN_FRONTEND" => "noninteractive", "LC_ALL" => nil },
+            :timeout => @timeout
+          )
           @provider.install_package("libmysqlclient-dev", "not_a_real_version")
       end
     end

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

@@ -122,46 +122,34 @@ DPKG_S
 
   describe Chef::Provider::Package::Dpkg, "install and upgrade" do
     it "should run dpkg -i with the package source" do
-      @provider.should_receive(:run_command_with_systems_locale).with({
-        :command => "dpkg -i /tmp/wget_1.11.4-1ubuntu1_amd64.deb",
-        :environment => {
-          "DEBIAN_FRONTEND" => "noninteractive"
-        }
-      })
+      @provider.should_receive(:run_noninteractive).with(
+        "dpkg -i /tmp/wget_1.11.4-1ubuntu1_amd64.deb"
+      )
       @provider.install_package("wget", "1.11.4-1ubuntu1")
     end
 
     it "should run dpkg -i if the package is a path and the source is nil" do
       @new_resource = Chef::Resource::Package.new("/tmp/wget_1.11.4-1ubuntu1_amd64.deb")
       @provider = Chef::Provider::Package::Dpkg.new(@new_resource, @run_context)
-      @provider.should_receive(:run_command_with_systems_locale).with({
-        :command => "dpkg -i /tmp/wget_1.11.4-1ubuntu1_amd64.deb",
-        :environment => {
-          "DEBIAN_FRONTEND" => "noninteractive"
-        }
-      })
+      @provider.should_receive(:run_noninteractive).with(
+        "dpkg -i /tmp/wget_1.11.4-1ubuntu1_amd64.deb"
+      )
       @provider.install_package("/tmp/wget_1.11.4-1ubuntu1_amd64.deb", "1.11.4-1ubuntu1")
     end
 
     it "should run dpkg -i if the package is a path and the source is nil for an upgrade" do
       @new_resource = Chef::Resource::Package.new("/tmp/wget_1.11.4-1ubuntu1_amd64.deb")
       @provider = Chef::Provider::Package::Dpkg.new(@new_resource, @run_context)
-      @provider.should_receive(:run_command_with_systems_locale).with({
-        :command => "dpkg -i /tmp/wget_1.11.4-1ubuntu1_amd64.deb",
-        :environment => {
-          "DEBIAN_FRONTEND" => "noninteractive"
-        }
-      })
+      @provider.should_receive(:run_noninteractive).with(
+        "dpkg -i /tmp/wget_1.11.4-1ubuntu1_amd64.deb"
+      )
       @provider.upgrade_package("/tmp/wget_1.11.4-1ubuntu1_amd64.deb", "1.11.4-1ubuntu1")
     end
 
     it "should run dpkg -i with the package source and options if specified" do
-      @provider.should_receive(:run_command_with_systems_locale).with({
-        :command => "dpkg -i --force-yes /tmp/wget_1.11.4-1ubuntu1_amd64.deb",
-        :environment => {
-          "DEBIAN_FRONTEND" => "noninteractive"
-        }
-      })
+      @provider.should_receive(:run_noninteractive).with(
+        "dpkg -i --force-yes /tmp/wget_1.11.4-1ubuntu1_amd64.deb"
+      )
       @new_resource.stub(:options).and_return("--force-yes")
 
       @provider.install_package("wget", "1.11.4-1ubuntu1")
@@ -174,44 +162,32 @@ DPKG_S
 
   describe Chef::Provider::Package::Dpkg, "remove and purge" do
     it "should run dpkg -r to remove the package" do
-      @provider.should_receive(:run_command_with_systems_locale).with({
-        :command => "dpkg -r wget",
-        :environment => {
-          "DEBIAN_FRONTEND" => "noninteractive"
-        }
-      })
+      @provider.should_receive(:run_noninteractive).with(
+        "dpkg -r wget"
+      )
       @provider.remove_package("wget", "1.11.4-1ubuntu1")
     end
 
     it "should run dpkg -r to remove the package with options if specified" do
-      @provider.should_receive(:run_command_with_systems_locale).with({
-        :command => "dpkg -r --force-yes wget",
-        :environment => {
-          "DEBIAN_FRONTEND" => "noninteractive"
-        }
-      })
+      @provider.should_receive(:run_noninteractive).with(
+        "dpkg -r --force-yes wget"
+      )
       @new_resource.stub(:options).and_return("--force-yes")
 
       @provider.remove_package("wget", "1.11.4-1ubuntu1")
     end
 
     it "should run dpkg -P to purge the package" do
-      @provider.should_receive(:run_command_with_systems_locale).with({
-        :command => "dpkg -P wget",
-        :environment => {
-          "DEBIAN_FRONTEND" => "noninteractive"
-        }
-      })
+      @provider.should_receive(:run_noninteractive).with(
+        "dpkg -P wget"
+      )
       @provider.purge_package("wget", "1.11.4-1ubuntu1")
     end
 
     it "should run dpkg -P to purge the package with options if specified" do
-      @provider.should_receive(:run_command_with_systems_locale).with({
-        :command => "dpkg -P --force-yes wget",
-        :environment => {
-          "DEBIAN_FRONTEND" => "noninteractive"
-        }
-      })
+      @provider.should_receive(:run_noninteractive).with(
+        "dpkg -P --force-yes wget"
+      )
       @new_resource.stub(:options).and_return("--force-yes")
 
       @provider.purge_package("wget", "1.11.4-1ubuntu1")

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

@@ -0,0 +1,135 @@
+#
+# Author:: Vasiliy Tolstov <v.tolstov@selfip.ru>
+# Copyright:: Copyright (c) 2014 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'ostruct'
+
+# based on the ips specs
+
+describe Chef::Provider::Package::Paludis do
+  before(:each) do
+    @node = Chef::Node.new
+    @events = Chef::EventDispatch::Dispatcher.new
+    @run_context = Chef::RunContext.new(@node, {}, @events)
+    @new_resource = Chef::Resource::Package.new("net/ntp")
+    @current_resource = Chef::Resource::Package.new("net/ntp")
+    Chef::Resource::Package.stub(:new).and_return(@current_resource)
+    @provider = Chef::Provider::Package::Paludis.new(@new_resource, @run_context)
+
+    @stdin = StringIO.new
+    @stderr = StringIO.new
+    @stdout =<<-PKG_STATUS
+group/ntp 0 accounts
+group/ntp 0 installed-accounts
+net/ntp 4.2.6_p5-r2 arbor
+user/ntp 0 accounts
+user/ntp 0 installed-accounts
+net/ntp 4.2.6_p5-r1 installed
+PKG_STATUS
+    @pid = 12345
+    @shell_out = 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)
+      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.load_current_resource
+    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.load_current_resource
+    end
+
+    it "should return new version if package is installed" do
+      @stdout.replace(<<-INSTALLED)
+group/ntp 0 accounts
+group/ntp 0 installed-accounts
+net/ntp 4.2.6_p5-r2 arbor
+user/ntp 0 accounts
+user/ntp 0 installed-accounts
+net/ntp 4.2.6_p5-r1 installed
+INSTALLED
+      @provider.should_receive(:shell_out!).and_return(@shell_out)
+      @provider.load_current_resource
+      @current_resource.version.should == "4.2.6_p5-r1"
+      @provider.candidate_version.should eql("4.2.6_p5-r2")
+    end
+
+    it "should return the current resource" do
+      @provider.should_receive(:shell_out!).and_return(@shell_out)
+      @provider.load_current_resource.should eql(@current_resource)
+    end
+  end
+
+  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.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\"")
+      @new_resource.stub(:options).and_return("--preserve-world")
+      @provider.install_package("net/ntp", "4.2.6_p5-r2")
+    end
+
+    it "should not contain invalid characters for the version string" do
+      @stdout.replace(<<-PKG_STATUS)
+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.install_package("sys-process/lsof", "4.87")
+    end
+
+    it "should not include the human-readable version in the candidate_version" do
+      @stdout.replace(<<-PKG_STATUS)
+sys-process/lsof 4.87 arbor
+sys-process/lsof 4.87 x86_64
+PKG_STATUS
+      @provider.should_receive(:shell_out!).and_return(@shell_out)
+      @provider.load_current_resource
+      @current_resource.version.should be_nil
+      @provider.candidate_version.should eql("4.87")
+    end
+  end
+
+  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.upgrade_package("net/ntp", "4.2.6_p5-r2")
+    end
+  end
+
+  context "when uninstalling a package" do
+    it "should run pkg uninstall with the package name and version" do
+      @provider.should_receive(:shell_out!).with("cave -L warning uninstall -x \"=net/ntp-4.2.6_p5-r2\"")
+      @provider.remove_package("net/ntp", "4.2.6_p5-r2")
+    end
+
+  end
+end