chef 10.14.0.beta.3 → 10.14.0.rc.0

data/spec/unit/knife/ssh_spec.rb

@@ -0,0 +1,145 @@
+#
+# Author:: Bryan McLellan <btm@opscode.com>
+# Copyright:: Copyright (c) 2012 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 'net/ssh'
+require 'net/ssh/multi'
+
+describe Chef::Knife::Ssh do
+  before(:all) do
+    @original_config = Chef::Config.hash_dup
+    Chef::Config[:client_key] = CHEF_SPEC_DATA + "/ssl/private_key.pem"
+  end
+
+  after(:all) do
+    Chef::Config.configuration = @original_config
+  end
+
+  before do
+    @knife = Chef::Knife::Ssh.new
+    @knife.config = {}
+    @knife.config[:attribute] = "fqdn"
+    @node_foo = Chef::Node.new('foo')
+    @node_foo[:fqdn] = "foo.example.org"
+    @node_bar = Chef::Node.new('foo')
+    @node_bar[:fqdn] = "bar.example.org"
+  end
+
+  describe "#configure_session" do
+    context "manual is set to false (default)" do
+      before do
+        @knife.config[:manual] = false
+        @query = Chef::Search::Query.new
+      end
+
+      def self.should_return_array_of_attributes
+        it "returns an array of the specified attributes if configured" do
+          @knife.config[:attribute] = "ipaddress"
+          @knife.config[:override_attribute] = "ipaddress"
+          @node_foo[:ipaddress] = "10.0.0.1"
+          @node_bar[:ipaddress] = "10.0.0.2"
+          @query.stub!(:search).and_return([[@node_foo, @node_bar]])
+          Chef::Search::Query.stub!(:new).and_return(@query)
+          @knife.should_receive(:session_from_list).with(['10.0.0.1', '10.0.0.2'])
+          @knife.configure_session
+        end
+      end
+
+      it "searchs for and returns an array of fqdns" do
+        @query.stub!(:search).and_return([[@node_foo, @node_bar]])
+        Chef::Search::Query.stub!(:new).and_return(@query)
+        @knife.should_receive(:session_from_list).with(['foo.example.org', 'bar.example.org'])
+        @knife.configure_session
+      end
+
+      should_return_array_of_attributes
+
+      context "when cloud hostnames are available" do
+        before do
+          @node_foo[:cloud] = Mash.new
+          @node_bar[:cloud] = Mash.new
+          @node_foo[:cloud][:public_hostname] = "ec2-10-0-0-1.compute-1.amazonaws.com"
+          @node_bar[:cloud][:public_hostname] = "ec2-10-0-0-2.compute-1.amazonaws.com"
+        end
+
+        it "returns an array of cloud public hostnames" do
+          @query.stub!(:search).and_return([[@node_foo, @node_bar]])
+          Chef::Search::Query.stub!(:new).and_return(@query)
+          @knife.should_receive(:session_from_list).with(['ec2-10-0-0-1.compute-1.amazonaws.com', 'ec2-10-0-0-2.compute-1.amazonaws.com'])
+          @knife.configure_session
+        end
+  
+        should_return_array_of_attributes
+      end
+
+      it "should raise an error if no host are found" do
+          @query.stub!(:search).and_return([[ ]])
+          Chef::Search::Query.stub!(:new).and_return(@query)
+          @knife.ui.should_receive(:fatal)
+          @knife.should_receive(:exit).with(10)
+          @knife.configure_session
+      end
+    end
+
+    context "manual is set to true" do
+      before do
+        @knife.config[:manual] = true
+      end
+
+      it "returns an array of provided values" do
+        @knife.instance_variable_set(:@name_args, ["foo.example.org bar.example.org"])
+        @knife.should_receive(:session_from_list).with(['foo.example.org', 'bar.example.org'])
+        @knife.configure_session
+      end
+    end
+  end
+
+  describe "#configure_attribute" do
+    before do
+      Chef::Config[:knife][:ssh_attribute] = nil
+      @knife.config[:attribute] = nil
+    end
+
+    it "should return fqdn by default" do
+      @knife.configure_attribute
+      @knife.config[:attribute].should == "fqdn"
+    end
+
+    it "should return the value set in the configuration file" do
+      Chef::Config[:knife][:ssh_attribute] = "magic"
+      @knife.configure_attribute
+      @knife.config[:attribute].should == "magic"
+    end
+
+    it "should return the value set on the command line" do
+      @knife.config[:attribute] = "penguins"
+      @knife.configure_attribute
+      @knife.config[:attribute].should == "penguins"
+    end
+
+    it "should set override_attribute to the value of attribute" do
+      @knife.config[:attribute] = "penguins"
+      @knife.configure_attribute
+      @knife.config[:attribute].should == "penguins"
+      @knife.config[:override_attribute].should == "penguins"
+    end
+
+  end
+
+end
+

data/spec/unit/mixin/command_spec.rb

@@ -49,7 +49,7 @@ describe Chef::Mixin::Command do
       end
 
       it "should end when the child process reads from STDIN and a block is given" do
-        lambda {Timeout.timeout(4) do
+        lambda {Timeout.timeout(10) do
             popen4("ruby -e 'while gets; end'", :waitlast => true) do |pid, stdin, stdout, stderr|
               (1..5).each { |i| stdin.puts "#{i}" }
             end
@@ -60,7 +60,7 @@ describe Chef::Mixin::Command do
       describe "when a process detaches but doesn't close STDOUT and STDERR [CHEF-584]" do
 
         it "returns immediately after the first child process exits" do
-          lambda {Timeout.timeout(4) do
+          lambda {Timeout.timeout(10) do
             pid, stdin,stdout,stderr = nil,nil,nil,nil
             evil_forker="exit if fork; 10.times { sleep 1}"
             popen4("ruby -e '#{evil_forker}'") do |pid,stdin,stdout,stderr|
@@ -88,8 +88,12 @@ describe Chef::Mixin::Command do
 
       describe "when a process detaches but doesn't close STDOUT and STDERR [CHEF-584]" do
         it "returns successfully" do
-          # CHEF-2916 might have added a slight delay here, or our CI infrastructure is burdened. Bumping timeout from 2 => 4 -- btm
-          lambda {Timeout.timeout(4) do
+          # CHEF-2916 might have added a slight delay here, or our CI
+          # infrastructure is burdened. Bumping timeout from 2 => 4 --
+          # btm
+          # Serdar - During Solaris tests, we've seen that processes
+          # are taking a long time to exit. Bumping timeout now to 10.
+          lambda {Timeout.timeout(10) do
             evil_forker="exit if fork; 10.times { sleep 1}"
             run_command(:command => "ruby -e '#{evil_forker}'")
           end}.should_not raise_error

data/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb

@@ -27,7 +27,8 @@ describe Chef::Mixin::EnforceOwnershipAndPermissions do
     @node.name "make_believe"
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
-    @resource = Chef::Resource::File.new("#{Dir.tmpdir}/madeup.txt")
+    @resource = Chef::Resource::File.new("#{Dir.mktmpdir}/madeup.txt")
+    FileUtils.touch @resource.path
     @resource.owner "adam"
     @provider = Chef::Provider::File.new(@resource, @run_context)
     @provider.current_resource = @resource

data/spec/unit/mixin/securable_spec.rb

@@ -119,11 +119,11 @@ describe Chef::Mixin::Securable do
     end
 
     after(:all) do
-      load File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "chef", "config.rb")
+      Chef::Config.configuration = @original_config if @original_config
     end
 
     after(:each) do
-      Chef::Config.configuration = @original_config
+      Chef::Config.configuration = @original_config if @original_config
     end
 
     it "should not accept a group name or id for group with spaces and multiple backslashes" do

data/spec/unit/provider/file_spec.rb

@@ -284,12 +284,14 @@ describe Chef::Provider::File do
          @provider.load_current_resource
          result = @provider.diff_current_from_content "foo baz"
          # remove the file name info which varies.
-         require 'pp'
-         pp result
          result.shift(2)
-         result.should == ["@@ -0,0 +1 @@", "+foo baz"] 
+	 # Result appearance seems to vary slightly under solaris diff
+         # So we'll compare the second line which is common to both.
+         # Solaris: -1,1 +1,0 @@, "+foo baz"
+	 # Linux/Mac: -1,0, +1 @@, "+foo baz"
+         result.length.should == 2
+         result[1].should == "+foo baz"
        end
     end
   end
 end
-

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

@@ -51,10 +51,15 @@ describe Chef::Provider::Group::Usermod do
 
       before do
         @new_resource.stub!(:members).and_return(["all", "your", "base"])
+        File.stub!(:exists?).and_return(true)
       end
 
       it "should raise an error when setting the entire group directly" do
-        lambda { @provider.modify_group_members }.should raise_error(Chef::Exceptions::Group, "setting group members directly is not supported by #{@provider.to_s}")
+        @provider.define_resource_requirements
+        @provider.load_current_resource
+        @provider.instance_variable_set("@group_exists", true)
+        @provider.action = :modify 
+        lambda { @provider.run_action(@provider.process_resource_requirements) }.should raise_error(Chef::Exceptions::Group, "setting group members directly is not supported by #{@provider.to_s}, must set append true in group")
       end
     
       platforms.each do |platform, flags|

data/spec/unit/provider/link_spec.rb

@@ -47,7 +47,7 @@ describe Chef::Resource::Link do
       lstat = mock("stats", :ino => 5)
       lstat.stub!(:uid).and_return(501)
       lstat.stub!(:gid).and_return(501)
-
+      lstat.stub!(:mode).and_return(0777)
       File.stub!(:lstat).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(lstat)
       provider.file_class.stub!(:symlink?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(true)
       provider.file_class.stub!(:readlink).with("#{CHEF_SPEC_DATA}/fofile-link").and_return("#{CHEF_SPEC_DATA}/fofile")
@@ -147,6 +147,7 @@ describe Chef::Resource::Link do
       stat = mock("stats", :ino => 5)
       stat.stub!(:uid).and_return(501)
       stat.stub!(:gid).and_return(501)
+      stat.stub!(:mode).and_return(0755)
       provider.file_class.stub!(:stat).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(stat)
 
       File.stub!(:exists?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(true)
@@ -178,6 +179,7 @@ describe Chef::Resource::Link do
         stat = mock("stats", :ino => 6)
         stat.stub!(:uid).and_return(502)
         stat.stub!(:gid).and_return(502)
+        stat.stub!(:mode).and_return(0644)
 
         provider.file_class.stub!(:stat).with("#{CHEF_SPEC_DATA}/fofile").and_return(stat)
 
@@ -204,6 +206,7 @@ describe Chef::Resource::Link do
         stat = mock("stats", :ino => 5)
         stat.stub!(:uid).and_return(502)
         stat.stub!(:gid).and_return(502)
+        stat.stub!(:mode).and_return(0644)
 
         provider.file_class.stub!(:stat).with("#{CHEF_SPEC_DATA}/fofile").and_return(stat)
 

data/spec/unit/provider/mdadm_spec.rb

@@ -32,30 +32,27 @@ describe Chef::Provider::Mdadm do
     @new_resource.chunk   256
 
     @provider = Chef::Provider::Mdadm.new(@new_resource, @run_context)
-    #Chef::Resource::Mdadm.stub!(:new).and_return(@current_resource)
-
-    # @status = mock("Status", :exitstatus => 0)
-    # @provider.stub!(:popen4).and_return(@status)
-    # @stdin = mock("STDIN", :null_object => true)
-    # @stdout = mock("STDOUT", :null_object => true)
-    # @stderr = mock("STDERR", :null_object => true)
-    # @pid = mock("PID", :null_object => true)
   end
 
   describe "when determining the current metadevice status" do
-
     it "should set the current resources mount point to the new resources mount point" do
-      @provider.stub!(:shell_out!).and_return(OpenStruct.new(:stdout => ''))
-      @provider.load_current_resource()
+      @provider.stub!(:shell_out!).and_return(OpenStruct.new(:status => 0))
+      @provider.load_current_resource
       @provider.current_resource.name.should == '/dev/md1'
       @provider.current_resource.raid_device.should == '/dev/md1'
     end
 
-    it "determines that the metadevice exists when mdadm output shows the metadevice" do
-      @provider.stub!(:shell_out!).with("mdadm --detail --scan").and_return(OpenStruct.new(:stdout => '/dev/md1'))
+    it "determines that the metadevice exists when mdadm exit code is zero" do
+      @provider.stub!(:shell_out!).with("mdadm --detail --test /dev/md1", :returns => [0,4]).and_return(OpenStruct.new(:status => 0))
       @provider.load_current_resource
       @provider.current_resource.exists.should be_true
     end
+
+    it "determines that the metadevice does not exist when mdadm exit code is 4" do
+      @provider.stub!(:shell_out!).with("mdadm --detail --test /dev/md1", :returns => [0,4]).and_return(OpenStruct.new(:status => 4))
+      @provider.load_current_resource
+      @provider.current_resource.exists.should be_false
+    end
   end
 
   describe "after the metadevice status is known" do

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

@@ -0,0 +1,210 @@
+#
+# Author:: Bryan McLellan <btm@opscode.com>
+# Copyright:: Copyright (c) 2012 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 apt specs
+
+describe Chef::Provider::Package::Ips do
+  before(:each) do
+    @node = Chef::Node.new
+    @node.cookbook_collection = {}
+    @events = Chef::EventDispatch::Dispatcher.new
+    @run_context = Chef::RunContext.new(@node, {}, @events)
+    @new_resource = Chef::Resource::Package.new("crypto/gnupg", @run_context)
+    @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)
+
+    @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
+ 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
+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("pkg info -r #{@new_resource.package_name}").and_return(@shell_out)
+      @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.load_current_resource
+    end
+
+    it "should set the installed version if package has one" do
+      @stdout.replace(<<-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
+      @provider.should_receive(:shell_out!).and_return(@shell_out)
+      @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)
+      @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(:run_command_with_systems_locale).with({
+        :command => "pkg install -q crypto/gnupg@2.0.17"
+      })
+      @provider.install_package("crypto/gnupg", "2.0.17")
+    end
+
+
+    it "should run pkg install with the package name and version and options if specified" do
+      @provider.should_receive(:run_command_with_systems_locale).with({
+        :command => "pkg --no-refresh install -q crypto/gnupg@2.0.17"
+      })
+      @new_resource.stub!(:options).and_return("--no-refresh")
+      @provider.install_package("crypto/gnupg", "2.0.17")
+    end
+
+    it "should not contain invalid characters for the version string" do
+      @stdout.replace(<<-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.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(: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")
+    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
+         State: Not Installed
+     Publisher: omnios
+       Version: 1.8.4.1 (1.8.4p1)
+ 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)
+      @provider.load_current_resource
+      @current_resource.version.should be_nil
+      @provider.candidate_version.should eql("1.8.4.1")
+    end
+
+    context "using the ips_package resource" 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)
+      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
+      end
+    end
+  end
+
+  context "when upgrading a package" do
+    it "should run pkg install with the package name and version" do
+      @provider.should_receive(:run_command_with_systems_locale).with({
+        :command => "pkg install -q crypto/gnupg@2.0.17"
+      })
+      @provider.upgrade_package("crypto/gnupg", "2.0.17")
+    end
+  end
+
+  context "when uninstalling a package" do
+    it "should run pkg uninstall with the package name and version" do
+      @provider.should_receive(:run_command_with_systems_locale).with({
+        :command => "pkg uninstall -q crypto/gnupg@2.0.17"
+      })
+      @provider.remove_package("crypto/gnupg", "2.0.17")
+    end
+
+    it "should run pkg uninstall with the package name and version and options if specified" do
+      @provider.should_receive(:run_command_with_systems_locale).with({
+        :command => "pkg --no-refresh uninstall -q crypto/gnupg@2.0.17"
+      })
+      @new_resource.stub!(:options).and_return("--no-refresh")
+      @provider.remove_package("crypto/gnupg", "2.0.17")
+    end
+  end
+end