chef 11.4.4 → 11.6.0.hotfix.1

data/spec/unit/provider/user/useradd_spec.rb

@@ -21,366 +21,20 @@
 require 'spec_helper'
 
 describe Chef::Provider::User::Useradd do
-  before(:each) do
-    @node = Chef::Node.new
-    @events = Chef::EventDispatch::Dispatcher.new
-    @run_context = Chef::RunContext.new(@node, {}, @events)
 
-    @new_resource = Chef::Resource::User.new("adam", @run_context)
-    @new_resource.comment "Adam Jacob"
-    @new_resource.uid 1000
-    @new_resource.gid 1000
-    @new_resource.home "/home/adam"
-    @new_resource.shell "/usr/bin/zsh"
-    @new_resource.password "abracadabra"
-    @new_resource.system false
-    @new_resource.manage_home false
-    @new_resource.non_unique false
-    @current_resource = Chef::Resource::User.new("adam", @run_context)
-    @current_resource.comment "Adam Jacob"
-    @current_resource.uid 1000
-    @current_resource.gid 1000
-    @current_resource.home "/home/adam"
-    @current_resource.shell "/usr/bin/zsh"
-    @current_resource.password "abracadabra"
-    @current_resource.system false
-    @current_resource.manage_home false
-    @current_resource.non_unique false
-    @current_resource.supports({:manage_home => false, :non_unique => false})
-    @provider = Chef::Provider::User::Useradd.new(@new_resource, @run_context)
-    @provider.current_resource = @current_resource
+  subject(:provider) do
+    p = described_class.new(@new_resource, @run_context)
+    p.current_resource = @current_resource
+    p
   end
 
-  describe "when setting option" do
-    field_list = {
-      'comment' => "-c",
-      'gid' => "-g",
-      'uid' => "-u",
-      'shell' => "-s",
-      'password' => "-p"
-    }
+  supported_useradd_options = {
+    'comment' => "-c",
+    'gid' => "-g",
+    'uid' => "-u",
+    'shell' => "-s",
+    'password' => "-p"
+  }
 
-    field_list.each do |attribute, option|
-      it "should check for differences in #{attribute} between the new and current resources" do
-        @current_resource.should_receive(attribute)
-        @new_resource.should_receive(attribute)
-        @provider.universal_options
-      end
-
-      it "should set the option for #{attribute} if the new resources #{attribute} is not nil" do
-        @new_resource.stub!(attribute).and_return("hola")
-        @provider.universal_options.should eql(" #{option} 'hola'")
-      end
-
-      it "should set the option for #{attribute} if the new resources #{attribute} is not nil, without homedir management" do
-        @new_resource.stub!(:supports).and_return({:manage_home => false,
-                                                    :non_unique => false})
-        @new_resource.stub!(attribute).and_return("hola")
-        @provider.universal_options.should eql(" #{option} 'hola'")
-      end
-
-      it "should set the option for #{attribute} if the new resources #{attribute} is not nil, without homedir management (using real attributes)" do
-        @new_resource.stub!(:manage_home).and_return(false)
-        @new_resource.stub!(:non_unique).and_return(false)
-        @new_resource.stub!(attribute).and_return("hola")
-        @provider.universal_options.should eql(" #{option} 'hola'")
-      end
-    end
-
-    it "should combine all the possible options" do
-      match_string = ""
-      field_list.sort{ |a,b| a[0] <=> b[0] }.each do |attribute, option|
-        @new_resource.stub!(attribute).and_return("hola")
-        match_string << " #{option} 'hola'"
-      end
-      @provider.universal_options.should eql(match_string)
-    end
-
-    describe "when we want to create a system user" do
-      before do
-        @new_resource.manage_home(true)
-        @new_resource.non_unique(false)
-      end
-
-      it "should set useradd -r" do
-        @new_resource.system(true)
-        @provider.useradd_options.should == " -r"
-      end
-    end
-
-    describe "when the resource has a different home directory and supports home directory management" do
-      before do
-        @new_resource.stub!(:home).and_return("/wowaweea")
-        @new_resource.stub!(:supports).and_return({:manage_home => true,
-                                                   :non_unique => false})
-      end
-
-      it "should set -m -d /homedir" do
-        @provider.universal_options.should == " -m -d '/wowaweea'"
-        @provider.useradd_options.should == ""
-      end
-    end
-
-    describe "when the resource has a different home directory and supports home directory management (using real attributes)" do
-      before do
-        @new_resource.stub!(:home).and_return("/wowaweea")
-        @new_resource.stub!(:manage_home).and_return(true)
-        @new_resource.stub!(:non_unique).and_return(false)
-      end
-
-      it "should set -m -d /homedir" do
-        @provider.universal_options.should eql(" -m -d '/wowaweea'")
-        @provider.useradd_options.should == ""
-      end
-    end
-
-    describe "when the resource supports non_unique ids" do
-      before do
-        @new_resource.stub!(:supports).and_return({:manage_home => false,
-                                                  :non_unique => true})
-      end
-
-      it "should set -m -o" do
-        @provider.universal_options.should eql(" -o")
-      end
-    end
-
-    describe "when the resource supports non_unique ids (using real attributes)" do
-      before do
-        @new_resource.stub!(:manage_home).and_return(false)
-        @new_resource.stub!(:non_unique).and_return(true)
-      end
-
-      it "should set -m -o" do
-        @provider.universal_options.should eql(" -o")
-      end
-    end
-  end
-
-  describe "when creating a user" do
-    before(:each) do
-      @current_resource = Chef::Resource::User.new(@new_resource.name, @run_context)
-      @current_resource.username(@new_resource.username)
-      @provider.current_resource = @current_resource
-      @provider.new_resource.manage_home true
-      @provider.new_resource.home "/Users/mud"
-      @provider.new_resource.gid '23'
-    end
-
-    it "runs useradd with the computed command options" do
-      command = "useradd -c 'Adam Jacob' -g '23' -p 'abracadabra' -s '/usr/bin/zsh' -u '1000' -m -d '/Users/mud' adam"
-      @provider.should_receive(:run_command).with({ :command => command }).and_return(true)
-      @provider.create_user
-    end
-
-    describe "and home is not specified for new system user resource" do
-
-      before do
-        @provider.new_resource.system true
-        # there is no public API to set attribute's value to nil 
-        @provider.new_resource.instance_variable_set("@home", nil)
-      end
-
-      it "should not include -m or -d in the command options" do
-        command = "useradd -c 'Adam Jacob' -g '23' -p 'abracadabra' -s '/usr/bin/zsh' -u '1000' -r adam"
-        @provider.should_receive(:run_command).with({ :command => command }).and_return(true)
-        @provider.create_user
-      end
-
-    end
-
-  end
-
-  describe "when managing a user" do
-    before(:each) do
-      @provider.new_resource.manage_home true
-      @provider.new_resource.home "/Users/mud"
-      @provider.new_resource.gid '23'
-    end
-
-    # CHEF-3423, -m must come before the username
-    it "runs usermod with the computed command options" do
-      @provider.should_receive(:run_command).with({ :command => "usermod -g '23' -m -d '/Users/mud' adam" }).and_return(true)
-      @provider.manage_user
-    end
-
-    it "does not set the -r option to usermod" do
-      @new_resource.system(true)
-      @provider.should_receive(:run_command).with({ :command => "usermod -g '23' -m -d '/Users/mud' adam" }).and_return(true)
-      @provider.manage_user
-    end
-
-    it "CHEF-3429: does not set -m if we aren't changing the home directory" do
-      @provider.should_receive(:updating_home?).and_return(false)
-      @provider.should_receive(:run_command).with({ :command => "usermod -g '23' adam" }).and_return(true)
-      @provider.manage_user
-    end
-  end
-
-  describe "when removing a user" do
-
-    it "should run userdel with the new resources user name" do
-      @provider.should_receive(:run_command).with({ :command => "userdel #{@new_resource.username}" }).and_return(true)
-      @provider.remove_user
-    end
-
-    it "should run userdel with the new resources user name and -r if manage_home is true" do
-      @new_resource.stub!(:supports).and_return({ :manage_home => true,
-                                                  :non_unique => false})
-      @provider.should_receive(:run_command).with({ :command => "userdel -r #{@new_resource.username}"}).and_return(true)
-      @provider.remove_user
-    end
-
-    it "should run userdel with the new resources user name if non_unique is true" do
-      @new_resource.stub!(:supports).and_return({ :manage_home => false,
-                                                  :non_unique => true})
-      @provider.should_receive(:run_command).with({ :command => "userdel #{@new_resource.username}"}).and_return(true)
-      @provider.remove_user
-    end
-  end
-
-  describe "when checking the lock" do
-    before(:each) do
-      # @node = Chef::Node.new
-      # @new_resource = mock("Chef::Resource::User",
-      #   :nil_object => true,
-      #   :username => "adam"
-      # )
-      @status = mock("Status", :exitstatus => 0)
-      #@provider = Chef::Provider::User::Useradd.new(@node, @new_resource)
-      @provider.stub!(:popen4).and_return(@status)
-      @stdin = mock("STDIN", :nil_object => true)
-      @stdout = mock("STDOUT", :nil_object => true)
-      @stdout.stub!(:gets).and_return("root P 09/02/2008 0 99999 7 -1")
-      @stderr = mock("STDERR", :nil_object => true)
-      @pid = mock("PID", :nil_object => true)
-    end
-
-    it "should call passwd -S to check the lock status" do
-      @provider.should_receive(:popen4).with("passwd -S #{@new_resource.username}").and_return(@status)
-      @provider.check_lock
-    end
-
-    it "should get the first line of passwd -S STDOUT" do
-      @provider.should_receive(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
-      @stdout.should_receive(:gets).and_return("root P 09/02/2008 0 99999 7 -1")
-      @provider.check_lock
-    end
-
-    it "should return false if status begins with P" do
-      @provider.should_receive(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
-      @provider.check_lock.should eql(false)
-    end
-
-    it "should return false if status begins with N" do
-      @stdout.stub!(:gets).and_return("root N")
-      @provider.should_receive(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
-      @provider.check_lock.should eql(false)
-    end
-
-    it "should return true if status begins with L" do
-      @stdout.stub!(:gets).and_return("root L")
-      @provider.should_receive(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
-      @provider.check_lock.should eql(true)
-    end
-
-    it "should raise a Chef::Exceptions::User if passwd -S fails on anything other than redhat/centos" do
-      @node.automatic_attrs[:platform] = 'ubuntu'
-      @status.should_receive(:exitstatus).and_return(1)
-      lambda { @provider.check_lock }.should raise_error(Chef::Exceptions::User)
-    end
-
-    ['redhat', 'centos'].each do |os|
-      it "should not raise a Chef::Exceptions::User if passwd -S exits with 1 on #{os} and the passwd package is version 0.73-1" do
-        @node.automatic_attrs[:platform] = os
-        @stdout.stub!(:gets).and_return("passwd-0.73-1\n")
-        @status.should_receive(:exitstatus).twice.and_return(1)
-        @provider.should_receive(:popen4).with("passwd -S #{@new_resource.username}")
-        @provider.should_receive(:popen4).with("rpm -q passwd").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
-        lambda { @provider.check_lock }.should_not raise_error(Chef::Exceptions::User)
-      end
-
-      it "should raise a Chef::Exceptions::User if passwd -S exits with 1 on #{os} and the passwd package is not version 0.73-1" do
-        @node.automatic_attrs[:platform] = os
-        @stdout.stub!(:gets).and_return("passwd-0.73-2\n")
-        @status.should_receive(:exitstatus).twice.and_return(1)
-        @provider.should_receive(:popen4).with("passwd -S #{@new_resource.username}")
-        @provider.should_receive(:popen4).with("rpm -q passwd").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
-        lambda { @provider.check_lock }.should raise_error(Chef::Exceptions::User)
-      end
-
-      it "should raise a Chef::Exceptions::User if passwd -S exits with something other than 0 or 1 on #{os}" do
-        @node.automatic_attrs[:platform] = os
-        @status.should_receive(:exitstatus).twice.and_return(2)
-        lambda { @provider.check_lock }.should raise_error(Chef::Exceptions::User)
-      end
-    end
-  end
-
-  describe "when locking the user" do
-    it "should run usermod -L with the new resources username" do
-      @provider.should_receive(:run_command).with({ :command => "usermod -L #{@new_resource.username}"})
-      @provider.lock_user
-    end
-  end
-
-  describe "when unlocking the user" do
-    it "should run usermod -L with the new resources username" do
-      @provider.should_receive(:run_command).with({ :command => "usermod -U #{@new_resource.username}"})
-      @provider.unlock_user
-    end
-  end
-
-  describe "when checking if home needs updating" do
-    [
-     {
-       "action" => "should return false if home matches",
-       "current_resource_home" => [ "/home/laurent" ],
-       "new_resource_home" => [ "/home/laurent" ],
-       "expected_result" => false
-     },
-     {
-       "action" => "should return true if home doesn't match",
-       "current_resource_home" => [ "/home/laurent" ],
-       "new_resource_home" => [ "/something/else" ],
-       "expected_result" => true
-     },
-     {
-       "action" => "should return false if home only differs by trailing slash",
-       "current_resource_home" => [ "/home/laurent" ],
-       "new_resource_home" => [ "/home/laurent/", "/home/laurent" ],
-       "expected_result" => false
-     },
-     {
-       "action" => "should return false if home is an equivalent path",
-       "current_resource_home" => [ "/home/laurent" ],
-       "new_resource_home" => [ "/home/./laurent", "/home/laurent" ],
-       "expected_result" => false
-     },
-    ].each do |home_check|
-      it home_check["action"] do
-        @provider.current_resource.home home_check["current_resource_home"].first
-        @current_home_mock = mock("Pathname")
-        @provider.new_resource.home home_check["new_resource_home"].first
-        @new_home_mock = mock("Pathname")
-
-        Pathname.should_receive(:new).with(@current_resource.home).and_return(@current_home_mock)
-        @current_home_mock.should_receive(:cleanpath).and_return(home_check["current_resource_home"].last)
-        Pathname.should_receive(:new).with(@new_resource.home).and_return(@new_home_mock)
-        @new_home_mock.should_receive(:cleanpath).and_return(home_check["new_resource_home"].last)
-
-        @provider.updating_home?.should == home_check["expected_result"]
-      end
-    end
-    it "should return true if the current home does not exist but a home is specified by the new resource" do
-      @new_resource = Chef::Resource::User.new("adam", @run_context)
-      @current_resource = Chef::Resource::User.new("adam", @run_context)
-      @provider = Chef::Provider::User::Useradd.new(@new_resource, @run_context)
-      @provider.current_resource = @current_resource
-      @current_resource.home nil
-      @new_resource.home "/home/kitten"
-
-      @provider.updating_home?.should == true
-    end
-  end
+  include_examples "a useradd-based user provider", supported_useradd_options
 end

data/spec/unit/resource/batch_spec.rb

@@ -0,0 +1,48 @@
+#
+# Author:: Adam Edwards (<adamed@opscode.com>)
+# Copyright:: Copyright (c) 2013 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'
+
+describe Chef::Resource::Batch do
+
+  before(:each) do
+    node = Chef::Node.new
+
+    node.default["kernel"] = Hash.new
+    node.default["kernel"][:machine] = :x86_64.to_s
+
+    run_context = Chef::RunContext.new(node, nil, nil)
+    
+    @resource = Chef::Resource::Batch.new("batch_unit_test", run_context)
+
+  end  
+
+  it "should create a new Chef::Resource::Batch" do
+    @resource.should be_a_kind_of(Chef::Resource::Batch)
+  end
+  
+  context "windows script" do
+    let(:resource_instance) { @resource }
+    let(:resource_instance_name ) { @resource.command }
+    let(:resource_name) { :batch }
+    let(:interpreter_file_name) { 'cmd.exe' }
+
+    it_should_behave_like "a Windows script resource"  
+  end
+  
+end

data/spec/unit/resource/conditional_action_not_nothing_spec.rb

@@ -0,0 +1,45 @@
+#
+# Author:: Xabier de Zuazo (<xabier@onddo.com>)
+# Copyright:: Copyright (c) 2013 Onddo Labs, SL.
+# 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'
+
+describe Chef::Resource::ConditionalActionNotNothing do
+
+  describe "after running a :nothing action" do
+    before do
+      @action = :nothing
+      @conditional = Chef::Resource::ConditionalActionNotNothing.new(@action)
+    end
+
+    it "indicates that resource convergence should not continue" do
+      @conditional.continue?.should be_false
+    end
+  end
+
+  describe "after running an action different to :nothing" do
+    before do
+      @action = :something
+      @conditional = Chef::Resource::ConditionalActionNotNothing.new(@action)
+    end
+
+    it "indicates that resource convergence should continue" do
+      @conditional.continue?.should be_true
+    end
+  end
+
+end