chef 13.6.4 → 13.7.16

data/spec/unit/resource/yum_package_spec.rb

@@ -78,7 +78,7 @@ describe Chef::Resource::YumPackage, "arch" do
     @resource = Chef::Resource::YumPackage.new("foo")
   end
 
-  it "should set the arch variable to whatever is passed in" do
+  it "sets the arch variable to whatever is passed in" do
     @resource.arch("i386")
     expect(@resource.arch).to eql("i386")
   end

data/spec/unit/resource/yum_repository_spec.rb

@@ -24,25 +24,78 @@ describe Chef::Resource::YumRepository do
   let(:run_context) { Chef::RunContext.new(node, {}, events) }
   let(:resource) { Chef::Resource::YumRepository.new("multiverse", run_context) }
 
-  context "on linux", :linux_only do
-    it "should create a new Chef::Resource::YumRepository" do
-      expect(resource).to be_a_kind_of(Chef::Resource)
-      expect(resource).to be_a_kind_of(Chef::Resource::YumRepository)
-    end
+  it "has a resource_name of :yum_repository" do
+    expect(resource.resource_name).to eq(:yum_repository)
+  end
+
+  it "the repositoryid property is the name_property" do
+    expect(resource.repositoryid).to eq("multiverse")
+  end
+
+  it "the timeout property expects numeric Strings" do
+    expect { resource.timeout "123" }.not_to raise_error(ArgumentError)
+    expect { resource.timeout "123foo" }.to raise_error(ArgumentError)
+  end
+
+  it "the priority property expects numeric Strings from '1' to '99'" do
+    expect { resource.priority "99" }.not_to raise_error(ArgumentError)
+    expect { resource.priority "1" }.not_to raise_error(ArgumentError)
+    expect { resource.priority "100" }.to raise_error(ArgumentError)
+    expect { resource.priority "0" }.to raise_error(ArgumentError)
+  end
+
+  it "the failovermethod property accepts 'priority' or 'roundrobin'" do
+    expect { resource.failovermethod "priority" }.not_to raise_error(ArgumentError)
+    expect { resource.failovermethod "roundrobin" }.not_to raise_error(ArgumentError)
+    expect { resource.failovermethod "bob" }.to raise_error(ArgumentError)
+  end
+
+  it "the http_caching property accepts 'packages', 'all', or 'none'" do
+    expect { resource.http_caching "packages" }.not_to raise_error(ArgumentError)
+    expect { resource.http_caching "all" }.not_to raise_error(ArgumentError)
+    expect { resource.http_caching "none" }.not_to raise_error(ArgumentError)
+    expect { resource.http_caching "bob" }.to raise_error(ArgumentError)
+  end
+
+  it "the metadata_expire property accepts a time value or 'never'" do
+    expect { resource.metadata_expire "100" }.not_to raise_error(ArgumentError)
+    expect { resource.metadata_expire "100d" }.not_to raise_error(ArgumentError)
+    expect { resource.metadata_expire "100h" }.not_to raise_error(ArgumentError)
+    expect { resource.metadata_expire "100m" }.not_to raise_error(ArgumentError)
+    expect { resource.metadata_expire "never" }.not_to raise_error(ArgumentError)
+    expect { resource.metadata_expire "100s" }.to raise_error(ArgumentError)
+  end
 
-    it "should resolve to a Noop class when yum is not found" do
+  it "the mirror_expire property accepts a time value" do
+    expect { resource.mirror_expire "100" }.not_to raise_error(ArgumentError)
+    expect { resource.mirror_expire "100d" }.not_to raise_error(ArgumentError)
+    expect { resource.mirror_expire "100h" }.not_to raise_error(ArgumentError)
+    expect { resource.mirror_expire "100m" }.not_to raise_error(ArgumentError)
+    expect { resource.mirror_expire "never" }.to raise_error(ArgumentError)
+  end
+
+  it "the mirrorlist_expire property accepts a time value" do
+    expect { resource.mirrorlist_expire "100" }.not_to raise_error(ArgumentError)
+    expect { resource.mirrorlist_expire "100d" }.not_to raise_error(ArgumentError)
+    expect { resource.mirrorlist_expire "100h" }.not_to raise_error(ArgumentError)
+    expect { resource.mirrorlist_expire "100m" }.not_to raise_error(ArgumentError)
+    expect { resource.mirrorlist_expire "never" }.to raise_error(ArgumentError)
+  end
+
+  context "on linux", :linux_only do
+    it "resolves to a Noop class when yum is not found" do
       expect(Chef::Provider::YumRepository).to receive(:which).with("yum").and_return(false)
       expect(resource.provider_for_action(:add)).to be_a(Chef::Provider::Noop)
     end
 
-    it "should resolve to a YumRepository class when yum is found" do
+    it "resolves to a YumRepository class when yum is found" do
       expect(Chef::Provider::YumRepository).to receive(:which).with("yum").and_return(true)
       expect(resource.provider_for_action(:add)).to be_a(Chef::Provider::YumRepository)
     end
   end
 
   context "on windows", :windows_only do
-    it "should resolve to a NoOp provider" do
+    it "resolves to a NoOp provider" do
       expect(resource.provider_for_action(:add)).to be_a(Chef::Provider::Noop)
     end
   end

data/spec/unit/resource/zypper_repository_spec.rb

@@ -24,28 +24,27 @@ describe Chef::Resource::ZypperRepository do
   let(:run_context) { Chef::RunContext.new(node, {}, events) }
   let(:resource) { Chef::Resource::ZypperRepository.new("repo-source", run_context) }
 
-  context "on linux", :linux_only do
-    it "should create a new Chef::Resource::ZypperRepository" do
-      expect(resource).to be_a_kind_of(Chef::Resource)
-      expect(resource).to be_a_kind_of(Chef::Resource::ZypperRepository)
-    end
+  it "has a resource_name of :zypper_repository" do
+    expect(resource.resource_name).to eq(:zypper_repository)
+  end
 
-    it "should have a name of repo-source" do
-      expect(resource.name).to eql("repo-source")
-    end
+  it "repo_name is the name_property" do
+    expect(resource.repo_name).to eql("repo-source")
+  end
 
-    it "should have a default action of create" do
-      expect(resource.action).to eql([:create])
-    end
+  it "has a default action of create" do
+    expect(resource.action).to eql([:create])
+  end
 
-    it "supports all valid actions" do
-      expect { resource.action :add }.not_to raise_error
-      expect { resource.action :remove }.not_to raise_error
-      expect { resource.action :create }.not_to raise_error
-      expect { resource.action :refresh }.not_to raise_error
-      expect { resource.action :delete }.to raise_error(ArgumentError)
-    end
+  it "supports all valid actions" do
+    expect { resource.action :add }.not_to raise_error
+    expect { resource.action :remove }.not_to raise_error
+    expect { resource.action :create }.not_to raise_error
+    expect { resource.action :refresh }.not_to raise_error
+    expect { resource.action :delete }.to raise_error(ArgumentError)
+  end
 
+  context "on linux", :linux_only do
     it "resolves to a Noop class when on non-linux OS" do
       node.automatic[:os] = "windows"
       node.automatic[:platform_family] = "windows"

data/spec/unit/util/selinux_spec.rb

@@ -124,24 +124,21 @@ describe Chef::Util::Selinux do
     end
 
     it "should call restorecon non-recursive by default" do
-      restorecon_command = "#{@restorecon_enabled_path} -R \"#{path}\""
-      expect(@test_instance).to receive(:shell_out!).twice.with(restorecon_command)
+      expect(@test_instance).to receive(:shell_out_compact!).twice.with(@restorecon_enabled_path, [ "-R", path ])
       @test_instance.restore_security_context(path)
       expect(File).not_to receive(:executable?)
       @test_instance.restore_security_context(path)
     end
 
     it "should call restorecon recursive when recursive is set" do
-      restorecon_command = "#{@restorecon_enabled_path} -R -r \"#{path}\""
-      expect(@test_instance).to receive(:shell_out!).twice.with(restorecon_command)
+      expect(@test_instance).to receive(:shell_out_compact!).twice.with(@restorecon_enabled_path, [ "-R", "-r", path ])
       @test_instance.restore_security_context(path, true)
       expect(File).not_to receive(:executable?)
       @test_instance.restore_security_context(path, true)
     end
 
     it "should call restorecon non-recursive when recursive is not set" do
-      restorecon_command = "#{@restorecon_enabled_path} -R \"#{path}\""
-      expect(@test_instance).to receive(:shell_out!).twice.with(restorecon_command)
+      expect(@test_instance).to receive(:shell_out_compact!).twice.with(@restorecon_enabled_path, [ "-R", path ])
       @test_instance.restore_security_context(path)
       expect(File).not_to receive(:executable?)
       @test_instance.restore_security_context(path)

data/tasks/dependencies.rb

@@ -39,8 +39,6 @@ namespace :dependencies do
                     dependencies:update_gemfile_lock
                     dependencies:update_omnibus_gemfile_lock
                     dependencies:update_acceptance_gemfile_lock
-                    dependencies:update_kitchen_tests_gemfile_lock
-                    dependencies:update_kitchen_tests_berksfile_lock
                     dependencies:update_audit_tests_berksfile_lock
                   }
 
@@ -84,9 +82,6 @@ namespace :dependencies do
   bundle_update_locked_multiplatform_task :update_gemfile_lock, "."
   bundle_update_locked_multiplatform_task :update_omnibus_gemfile_lock, "omnibus"
   bundle_update_task :update_acceptance_gemfile_lock, "acceptance"
-  bundle_update_locked_multiplatform_task :update_kitchen_tests_gemfile_lock, "kitchen-tests"
-
-  berks_update_task :update_kitchen_tests_berksfile_lock, "kitchen-tests"
   berks_update_task :update_audit_tests_berksfile_lock, "kitchen-tests/cookbooks/audit_test"
 
 end

data/tasks/rspec.rb

@@ -25,7 +25,7 @@ CHEF_ROOT = File.join(File.dirname(__FILE__), "..")
 begin
   require "rspec/core/rake_task"
 
-  desc "Run specs for Chef's Components"
+  desc "Run specs for Chef's Components (chef-config)"
   task :component_specs do
     Dir.chdir("chef-config") do
       Bundler.with_clean_env do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 13.6.4
+  version: 13.7.16
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.6.4
+        version: 13.7.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.6.4
+        version: 13.7.16
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -519,8 +519,6 @@ files:
 - acceptance/top-cookbooks/.acceptance/acceptance-cookbook/recipes/verify.rb
 - acceptance/top-cookbooks/.gitignore
 - acceptance/top-cookbooks/.kitchen.chocolatey.yml
-- acceptance/top-cookbooks/.kitchen.docker.yml
-- acceptance/top-cookbooks/.kitchen.git.yml
 - acceptance/top-cookbooks/.kitchen.iis.yml
 - acceptance/top-cookbooks/.kitchen.learn-the-basics-rhel.yml
 - acceptance/top-cookbooks/.kitchen.learn-the-basics-ubuntu.yml
@@ -1620,6 +1618,7 @@ files:
 - spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-xi0l6h-0
 - spec/data/client.d_00/00-foo.rb
 - spec/data/client.d_00/01-bar.rb
+- spec/data/client.d_00/02-strings.rb
 - spec/data/client.d_00/bar
 - spec/data/client.d_01/foo/bar.rb
 - spec/data/client.d_02/foo.rb/foo.txt
@@ -2539,6 +2538,7 @@ files:
 - spec/unit/resource/powershell_package_spec.rb
 - spec/unit/resource/powershell_script_spec.rb
 - spec/unit/resource/python_spec.rb
+- spec/unit/resource/reboot_spec.rb
 - spec/unit/resource/registry_key_spec.rb
 - spec/unit/resource/remote_directory_spec.rb
 - spec/unit/resource/remote_file_spec.rb

data/acceptance/top-cookbooks/.kitchen.docker.yml

@@ -1,13 +0,0 @@
-suites:
-  - name: docker-default
-    attributes:
-      apt-docker:
-        repos:
-          docker-main:
-            keyserver: hkp://ha.pool.sks-keyservers.net
-      docker:
-        version: 1.10.0
-    run_list:
-      - recipe[apt]
-      - recipe[chef-apt-docker]
-    includes: [ubuntu-14.04]

data/acceptance/top-cookbooks/.kitchen.git.yml

@@ -1,11 +0,0 @@
-suites:
-  - name: git-default
-    # Ubuntu images need to run apt update
-    run_list: ["recipe[apt]","recipe[git]"]
-    includes: [ubuntu-14.04]
-  - name: git-source
-    run_list: ["recipe[git::source]"]
-    includes: [nonexistent]
-  - name: git-default-windows
-    run_list: ["recipe[git]"]
-    includes: [windows-2012r2]