chef 11.4.4 → 11.6.0.hotfix.1

data/spec/unit/provider/service/systemd_service_spec.rb

@@ -135,7 +135,7 @@ describe Chef::Provider::Service::Systemd do
 
     it "should not call '/bin/systemctl start service_name' if it is already running" do
       @current_resource.stub!(:running).and_return(true)
-      @provider.should_not_receive(:run_command_with_systems_locale).with({:command => "/bin/systemctl start #{@new_resource.service_name}"}).and_return(0)
+      @provider.should_not_receive(:run_command_with_systems_locale).with({:command => "/bin/systemctl start #{@new_resource.service_name}"})
       @provider.start_service
     end
 
@@ -180,7 +180,7 @@ describe Chef::Provider::Service::Systemd do
 
     it "should not call '/bin/systemctl stop service_name' if it is already stopped" do
       @current_resource.stub!(:running).and_return(false)
-      @provider.should_not_receive(:run_command_with_systems_locale).with({:command => "/bin/systemctl stop #{@new_resource.service_name}"}).and_return(0)
+      @provider.should_not_receive(:run_command_with_systems_locale).with({:command => "/bin/systemctl stop #{@new_resource.service_name}"})
       @provider.stop_service
     end
   end

data/spec/unit/provider/service/upstart_service_spec.rb

@@ -247,7 +247,7 @@ describe Chef::Provider::Service::Upstart do
 
     it "should not call '/sbin/start service_name' if it is already running" do
       @current_resource.stub!(:running).and_return(true)
-      @provider.should_not_receive(:run_command_with_systems_locale).with({:command => "/sbin/start #{@new_resource.service_name}"}).and_return(0)
+      @provider.should_not_receive(:run_command_with_systems_locale).with({:command => "/sbin/start #{@new_resource.service_name}"})
       @provider.start_service()
     end
 
@@ -307,7 +307,7 @@ describe Chef::Provider::Service::Upstart do
 
     it "should not call '/sbin/stop service_name' if it is already stopped" do
       @current_resource.stub!(:running).and_return(false)
-      @provider.should_not_receive(:run_command_with_systems_locale).with({:command => "/sbin/stop #{@new_resource.service_name}"}).and_return(0)
+      @provider.should_not_receive(:run_command_with_systems_locale).with({:command => "/sbin/stop #{@new_resource.service_name}"})
       @provider.stop_service()
     end
   end

data/spec/unit/provider/service_spec.rb

@@ -60,7 +60,7 @@ describe Chef::Provider::Service do
 
     it "should not disable the service if already disabled" do
       @current_resource.stub!(:enabled).and_return(false)
-      @provider.should_not_receive(:disable_service).and_return(true)
+      @provider.should_not_receive(:disable_service)
       @provider.run_action(:disable)
       @provider.new_resource.should_not be_updated
     end
@@ -92,7 +92,7 @@ describe Chef::Provider::Service do
 
     it "should not stop the service if it's already stopped" do
       @current_resource.stub!(:running).and_return(false)
-      @provider.should_not_receive(:stop_service).and_return(true)
+      @provider.should_not_receive(:stop_service)
       @provider.run_action(:stop)
       @provider.new_resource.should_not be_updated
     end
@@ -137,7 +137,7 @@ describe Chef::Provider::Service do
 
     it "should not reload the service if it's stopped" do
       @current_resource.stub!(:running).and_return(false)
-      @provider.should_not_receive(:reload_service).and_return(true)
+      @provider.should_not_receive(:reload_service)
       @provider.run_action(:stop)
       @provider.new_resource.should_not be_updated
     end

data/spec/unit/provider/template/content_spec.rb

@@ -0,0 +1,78 @@
+#
+# Author:: Lamont Granquist (<lamont@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::Provider::Template::Content do
+
+  let(:new_resource) do
+    mock("Chef::Resource::Template (new)",
+         :cookbook_name => 'openldap',
+         :source => 'openldap_stuff.conf.erb',
+         :local => false,
+         :cookbook => nil,
+         :variables => {},
+         :inline_helper_blocks => {},
+         :inline_helper_modules => [],
+         :helper_modules => [])
+  end
+
+  let(:rendered_file_location) { Dir.tmpdir + '/openldap_stuff.conf' }
+
+  let(:run_context) do
+    cookbook_repo = File.expand_path(File.join(CHEF_SPEC_DATA, "cookbooks"))
+    Chef::Cookbook::FileVendor.on_create { |manifest| Chef::Cookbook::FileSystemFileVendor.new(manifest, cookbook_repo) }
+    cl = Chef::CookbookLoader.new(cookbook_repo)
+    cl.load_cookbooks
+    cookbook_collection = Chef::CookbookCollection.new(cl)
+    node = Chef::Node.new
+    mock("Chef::Resource::RunContext", :node => node, :cookbook_collection => cookbook_collection)
+  end
+
+  let(:content) do
+    current_resource = mock("Chef::Resource::Template (current)")
+    Chef::Provider::Template::Content.new(new_resource, current_resource, run_context)
+  end
+
+  after do
+    FileUtils.rm(rendered_file_location) if ::File.exist?(rendered_file_location)
+  end
+
+  it "finds the template file in the cookbook cache if it isn't local" do
+    content.template_location.should == CHEF_SPEC_DATA + '/cookbooks/openldap/templates/default/openldap_stuff.conf.erb'
+  end
+
+  it "finds the template file locally if it is local" do
+    new_resource.stub!(:local).and_return(true)
+    new_resource.stub!(:source).and_return('/tmp/its_on_disk.erb')
+    content.template_location.should == '/tmp/its_on_disk.erb'
+  end
+
+  it "should use the cookbook name if defined in the template resource" do
+    new_resource.stub!(:cookbook_name).and_return('apache2')
+    new_resource.stub!(:cookbook).and_return('openldap')
+    new_resource.stub!(:source).and_return("test.erb")
+    content.template_location.should == CHEF_SPEC_DATA + '/cookbooks/openldap/templates/default/test.erb'
+  end
+
+  it "creates the template with the rendered content" do
+    run_context.node.normal[:slappiness] = "a warm gun"
+    IO.read(content.tempfile.path).should == "slappiness is a warm gun"
+  end
+
+end

data/spec/unit/provider/template_spec.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Lamont Granquist (<lamont@opscode.com>)
+# Copyright:: Copyright (c) 2008-2013 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,205 +16,72 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
 require 'stringio'
 require 'spec_helper'
 require 'etc'
 require 'ostruct'
+require 'support/shared/unit/provider/file'
 
-describe Chef::Provider::Template do
-  before(:each) do
-    @cookbook_repo = File.expand_path(File.join(CHEF_SPEC_DATA, "cookbooks"))
-    Chef::Cookbook::FileVendor.on_create { |manifest| Chef::Cookbook::FileSystemFileVendor.new(manifest, @cookbook_repo) }
-
-    @node = Chef::Node.new
-    cl = Chef::CookbookLoader.new(@cookbook_repo)
-    cl.load_cookbooks
-    @cookbook_collection = Chef::CookbookCollection.new(cl)
-    @events = Chef::EventDispatch::Dispatcher.new
-    @run_context = Chef::RunContext.new(@node, @cookbook_collection, @events)
-
-    @rendered_file_location = Dir.tmpdir + '/openldap_stuff.conf'
 
-    @resource = Chef::Resource::Template.new(@rendered_file_location)
-    @resource.cookbook_name = 'openldap'
-
-    @provider = Chef::Provider::Template.new(@resource, @run_context)
-    @current_resource = @resource.dup
-    @provider.current_resource = @current_resource
-    @access_controls = mock("access controls")
-    @provider.stub!(:access_controls).and_return(@access_controls)
-    passwd_struct = if windows?
-                      Struct::Passwd.new("root", "x", 0, 0, "/root", "/bin/bash")
-                    else
-                      Struct::Passwd.new("root", "x", 0, 0, "root", "/root", "/bin/bash")
-                    end
-    group_struct = mock("Group Ent", :name => "root", :passwd => "x", :gid => 0)
-    Etc.stub!(:getpwuid).and_return(passwd_struct)
-    Etc.stub!(:getgrgid).and_return(group_struct)
+describe Chef::Provider::Template do
+  let(:node) { double('Chef::Node') }
+  let(:events) { double('Chef::Events').as_null_object }  # mock all the methods
+  let(:run_context) { double('Chef::RunContext', :node => node, :events => events) }
+  let(:enclosing_directory) {
+    canonicalize_path(File.expand_path(File.join(CHEF_SPEC_DATA, "templates")))
+  }
+  let(:resource_path) {
+    canonicalize_path(File.expand_path(File.join(enclosing_directory, "seattle.txt")))
+  }
+
+  # Subject
+
+  let(:provider) do
+    provider = described_class.new(resource, run_context)
+    provider.stub!(:content).and_return(content)
+    provider
   end
 
-  describe "when creating the template" do
-
-    before do
-    end
-
-    after do
-      FileUtils.rm(@rendered_file_location) if ::File.exist?(@rendered_file_location)
-    end
-
-    it "finds the template file in the coobook cache if it isn't local" do
-      @provider.template_location.should == CHEF_SPEC_DATA + '/cookbooks/openldap/templates/default/openldap_stuff.conf.erb'
-    end
-
-    it "finds the template file locally if it is local" do
-      @resource.local(true)
-      @resource.source('/tmp/its_on_disk.erb')
-      @provider.template_location.should == '/tmp/its_on_disk.erb'
-    end
-
-    it "stops executing when the local template source can't be found" do 
-      @access_controls.stub!(:requires_changes?).and_return(false)
-      @resource.source "invalid.erb" 
-      @resource.local true
-      lambda { @provider.run_action(:create) } .should raise_error Chef::Mixin::WhyRun::ResourceRequirements::Assertion::AssertionFailure
-    end
-
-    it "should use the cookbook name if defined in the template resource" do
-      @resource.cookbook_name = 'apache2'
-      @resource.cookbook('openldap')
-      @resource.source "test.erb"
-      @provider.template_location.should == CHEF_SPEC_DATA + '/cookbooks/openldap/templates/default/test.erb'
-    end
-
-    describe "when the target file does not exist" do
-      it "creates the template with the rendered content" do
-        @access_controls.stub!(:requires_changes?).and_return(true)
-        @access_controls.should_receive(:set_all!)
-        @node.normal[:slappiness] = "a warm gun"
-        @provider.should_receive(:backup)
-        @provider.run_action(:create)
-        IO.read(@rendered_file_location).should == "slappiness is a warm gun"
-        @resource.should be_updated_by_last_action
-      end
-
-      it "should set the file access control as specified in the resource" do
-        @access_controls.stub!(:requires_changes?).and_return(false)
-        @access_controls.should_receive(:set_all!)
-        @resource.owner("adam")
-        @resource.group("wheel")
-        @resource.mode(00644)
-        @provider.run_action(:create)
-        @resource.should be_updated_by_last_action
-      end
-
-      it "creates the template with the rendered content for the create if missing action" do
-        @access_controls.stub!(:requires_changes?).and_return(true)
-        @access_controls.should_receive(:set_all!)
-        @node.normal[:slappiness] = "happiness"
-        @provider.should_receive(:backup)
-        @provider.run_action(:create_if_missing)
-        IO.read(@rendered_file_location).should == "slappiness is happiness"
-        @resource.should be_updated_by_last_action
-      end
-
-      context "and no access control settings are set on the resource" do
-        context "on a Unix system" do
-          before do
-            Chef::Platform.stub!(:windows?).and_return(false)
-          end
+  let(:resource) do
+    resource = Chef::Resource::Template.new("seattle", @run_context)
+    resource.path(resource_path)
+    resource
+  end
 
-          it "sets access control metadata on the new resource" do
-            @access_controls.stub!(:requires_changes?).and_return(false)
-            @access_controls.should_receive(:set_all!)
-            @node.normal[:slappiness] = "happiness"
-            @provider.should_receive(:backup)
-            @provider.run_action(:create)
-            IO.read(@rendered_file_location).should == "slappiness is happiness"
-            @resource.should be_updated_by_last_action
+  let(:content) do
+    content = mock('Chef::Provider::File::Content::Template', :template_location => "/foo/bar/baz")
+    File.stub(:exists?).with("/foo/bar/baz").and_return(true)
+    content
+  end
 
-            # Veracity of actual data checked in functional tests
-            @resource.owner.should be_a_kind_of(String)
-            @resource.group.should be_a_kind_of(String)
-            @resource.mode.should be_a_kind_of(String)
-          end
-        end
-      end
-    end
+  it_behaves_like Chef::Provider::File
 
-    describe "when the target file has the wrong content" do
-      before do
-        File.open(@rendered_file_location, "w+") { |f| f.print "blargh" }
-      end
+  context "when creating the template" do
 
-      it "overwrites the file with the updated content when the create action is run" do
-        @node.normal[:slappiness] = "a warm gun"
-        @access_controls.stub!(:requires_changes?).and_return(false)
-        @access_controls.should_receive(:set_all!)
-        @provider.should_receive(:backup)
-        @provider.run_action(:create)
-        IO.read(@rendered_file_location).should == "slappiness is a warm gun"
-        @resource.should be_updated_by_last_action
-      end
+    let(:node) { double('Chef::Node') }
+    let(:events) { double('Chef::Events').as_null_object }  # mock all the methods
+    let(:run_context) { double('Chef::RunContext', :node => node, :events => events) }
+    let(:enclosing_directory) {
+      canonicalize_path(File.expand_path(File.join(CHEF_SPEC_DATA, "templates")))
+    }
+    let(:resource_path) {
+      canonicalize_path(File.expand_path(File.join(enclosing_directory, "seattle.txt")))
+    }
 
-      it "should set the file access control as specified in the resource" do
-        @access_controls.stub!(:requires_changes?).and_return(true)
-        @access_controls.should_receive(:set_all!)
-        @resource.owner("adam")
-        @resource.group("wheel")
-        @resource.mode(00644)
-        @provider.should_receive(:backup)
-        @provider.run_action(:create)
-        @resource.should be_updated_by_last_action
-      end
+    # Subject
 
-      it "doesn't overwrite the file when the create if missing action is run" do
-        @access_controls.stub!(:requires_changes?).and_return(false)
-        @access_controls.should_not_receive(:set_all!)
-        @node.normal[:slappiness] = "a warm gun"
-        @provider.should_not_receive(:backup)
-        @provider.run_action(:create_if_missing)
-        IO.read(@rendered_file_location).should == "blargh"
-        @resource.should_not be_updated_by_last_action
-      end
+    let(:provider) do
+      provider = described_class.new(resource, run_context)
+      provider.stub!(:content).and_return(content)
+      provider
     end
 
-    describe "when the target has the correct content" do
-      before do
-        File.open(@rendered_file_location, "w") { |f| f.print "slappiness is a warm gun" }
-        @current_resource.checksum('4ff94a87794ed9aefe88e734df5a66fc8727a179e9496cbd88e3b5ec762a5ee9')
-        @access_controls = mock("access controls")
-        @provider.stub!(:access_controls).and_return(@access_controls)
-      end
-
-      it "does not backup the original or overwrite it" do
-        @node.normal[:slappiness] = "a warm gun"
-        @access_controls.stub!(:requires_changes?).and_return(false)
-        @provider.should_not_receive(:backup)
-        FileUtils.should_not_receive(:mv)
-        @provider.run_action(:create)
-        @resource.should_not be_updated_by_last_action
-      end
-
-      it "does not backup the original or overwrite it on create if missing" do
-        @node.normal[:slappiness] = "a warm gun"
-        @access_controls.stub!(:requires_changes?).and_return(false)
-        @provider.should_not_receive(:backup)
-        FileUtils.should_not_receive(:mv)
-        @provider.run_action(:create)
-        @resource.should_not be_updated_by_last_action
-      end
-
-      it "sets the file access controls if they have diverged" do
-        @provider.stub!(:backup).and_return(true)
-        @access_controls.stub!(:requires_changes?).and_return(true)
-        @access_controls.should_receive(:set_all!)
-        @resource.owner("adam")
-        @resource.group("wheel")
-        @resource.mode(00644)
-        @provider.should_receive(:backup)
-        @provider.run_action(:create)
-        @resource.should be_updated_by_last_action
-      end
+    it "stops executing when the local template source can't be found" do
+      setup_normal_file
+      content.stub!(:template_location).and_return("/baz/bar/foo")
+      File.stub(:exists?).with("/baz/bar/foo").and_return(false)
+      lambda { provider.run_action(:create) }.should raise_error Chef::Mixin::WhyRun::ResourceRequirements::Assertion::AssertionFailure
     end
 
   end

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

@@ -0,0 +1,80 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2008, 2010 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::Provider::User::Solaris do
+
+  subject(:provider) do
+    p = described_class.new(@new_resource, @run_context)
+    p.current_resource = @current_resource
+
+    # Prevent the useradd-based provider tests from trying to write /etc/shadow
+    p.stub!(:write_shadow_file)
+    p
+  end
+
+  supported_useradd_options = {
+    'comment' => "-c",
+    'gid' => "-g",
+    'uid' => "-u",
+    'shell' => "-s"
+  }
+
+  include_examples "a useradd-based user provider", supported_useradd_options
+
+  describe "when we want to set a password" 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)
+      @current_resource = Chef::Resource::User.new("adam", @run_context)
+
+      @new_resource.password "hocus-pocus"
+
+      # Let these tests run #write_shadow_file
+      provider.unstub!(:write_shadow_file)
+    end
+
+    it "should use its own shadow file writer to set the password" do
+      provider.should_receive(:write_shadow_file)
+      provider.stub!(:shell_out!).and_return(true)
+      provider.manage_user
+    end
+
+    it "should write out a modified version of the password file" do
+      password_file = Tempfile.new("shadow")
+      password_file.puts "adam:existingpassword:15441::::::"
+      password_file.close
+      provider.password_file = password_file.path
+      provider.stub!(:shell_out!).and_return(true)
+      # may not be able to write to /etc for tests...
+      temp_file = Tempfile.new("shadow")
+      Tempfile.stub!(:new).with("shadow", "/etc").and_return(temp_file)
+      @new_resource.password "verysecurepassword"
+      provider.manage_user
+      ::File.open(password_file.path, "r").read.should =~ /adam:verysecurepassword:/
+      password_file.unlink
+    end
+  end
+
+end