Merge branch 'master' of github.com:chef/chef into windows_audit_policy

22 files changed, 113 insertions, 111 deletions

diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml
index b66e29f2d9..a429ee4703 100644
--- a/.expeditor/release.omnibus.yml
+++ b/.expeditor/release.omnibus.yml
@@ -10,8 +10,7 @@ builder-to-testers-map:
   aix-7.1-powerpc:
     - aix-7.1-powerpc
     - aix-7.2-powerpc
-  debian-8-x86_64:
-    - debian-8-x86_64
+  debian-9-x86_64:
     - debian-9-x86_64
     - debian-10-x86_64
   debian-10-aarch64:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2cefe7e5f0..689ca85514 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,20 @@
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 16.2.26 -->
-## [v16.2.26](https://github.com/chef/chef/tree/v16.2.26) (2020-06-10)
+<!-- latest_release 16.2.29 -->
+## [v16.2.29](https://github.com/chef/chef/tree/v16.2.29) (2020-06-11)
 
 #### Merged Pull Requests
-- Allow for the latest net-ssh and ffi 1.13.1  [#9978](https://github.com/chef/chef/pull/9978) ([tas50](https://github.com/tas50))
+- Small code cleanups in script/windows_script [#9979](https://github.com/chef/chef/pull/9979) ([phiggins](https://github.com/phiggins))
+- Update with 2020 MVPs [#9985](https://github.com/chef/chef/pull/9985) ([Xorima](https://github.com/Xorima))
 <!-- latest_release -->
 
 <!-- release_rollup since=16.1.16 -->
 ### Changes not yet released to stable
 
 #### Merged Pull Requests
+- Small code cleanups in script/windows_script [#9979](https://github.com/chef/chef/pull/9979) ([phiggins](https://github.com/phiggins)) <!-- 16.2.29 -->
+- Update with 2020 MVPs [#9985](https://github.com/chef/chef/pull/9985) ([Xorima](https://github.com/Xorima)) <!-- 16.2.28 -->
+- Use /etc/chef for bootstrapping instead of ChefConfig [#9984](https://github.com/chef/chef/pull/9984) ([dheerajd-msys](https://github.com/dheerajd-msys)) <!-- 16.2.28 -->
+- Stop producing packages for EOL Debian 8 [#9981](https://github.com/chef/chef/pull/9981) ([tas50](https://github.com/tas50)) <!-- 16.2.27 -->
 - Allow for the latest net-ssh and ffi 1.13.1  [#9978](https://github.com/chef/chef/pull/9978) ([tas50](https://github.com/tas50)) <!-- 16.2.26 -->
 - Warn during bootstrapping when using validation keys [#9974](https://github.com/chef/chef/pull/9974) ([tas50](https://github.com/tas50)) <!-- 16.2.25 -->
 - Let the user know what protocol we&#39;re using in knife bootstrap [#9973](https://github.com/chef/chef/pull/9973) ([tas50](https://github.com/tas50)) <!-- 16.2.24 -->
diff --git a/CHEF_MVPS.md b/CHEF_MVPS.md
index e1f931e760..e623e4a948 100644
--- a/CHEF_MVPS.md
+++ b/CHEF_MVPS.md
@@ -1,24 +1,78 @@
-### Chef is proud of our community!
+# Chef is proud of our community
 
 Every release of Chef we pick someone from the community to name as the Most Valuable Player for that release. It could be someone who provided a big feature, reported a security vulnerability, or someone doing great things in the community that we want to highlight.
 
 In addition to the Hall of Fame and MVP recipients, a number of individuals are awarded the distinction
 of "Awesome Community Chef" each year at ChefConf.
 
-#### Hall of Fame
+## Lifetime Community Chef Award
+
+The Lifetime Community Chef Award is a recognition of years of investment by a member of the community, and is awarded only occasionally.
+
+- [2020](https://blog.chef.io/congratulations-awesome-community-chefs-2020/)
+  - [Mandi Walls](https://github.com/lnxchk)
+- [2019](https://blog.chef.io/congratulations-to-our-2019-awesome-community-chefs/)
+  - [Nathen Harvey](https://github.com/NathenHarvey)
+
+## Awesome Community Chefs
+
+Each year at ChefConf, a number of individuals are awarded the Awesome Community Chef award. The Awesome Community Chef awards are a way for the community to recognize a few of the individuals who have made a dramatic impact and have helped further the cause.
+
+- [2020](https://blog.chef.io/congratulations-awesome-community-chefs-2020/)
+  - [Bastien Jove](https://github.com/tensibai)
+  - [Lance Albertson](https://github.com/ramereth)
+  - [Marc Chamberland](https://github.com/bobchaos)
+- [2019][USA](https://blog.chef.io/congratulations-to-our-2019-awesome-community-chefs/), [Europe](https://blog.chef.io/congratulations-to-our-chefconf-london-2019-award-winners/)
+  - [Graham Weldon](https://github.com/predominant)
+  - [Jason Field](https://github.com/xorima)
+  - [Joshua Basch](https://github.com/HT154)
+  - [Karl Fischer](https://github.com/kmf)
+  - [Nathen Harvey](https://github.com/NathenHarvey)
+  - [Robb Kidd](https://github.com/RobbKidd)
+  - [Tomas Heinen](https://github.com/tecracer-theinen)
+- [2018](https://blog.chef.io/2018/05/24/2018-awesome-community-chefs/)
+  - [Dan Webb](https://github.com/damacus)
+  - [Romain Sertelon](https://github.com/rsertelon)
+  - [Edmund Haselwanter](https://github.com/ehaselwanter)
+  - [Tim Smith](https://github.com/tas50)
+  - [Joshua Timberman](https://github.com/jtimberman)
+- [2017](https://blog.chef.io/2017/06/08/awesome-community-chefs-2017-award-winners/)
+  - [Ben Dang](https://github.com/bdangit)
+  - [Annie Hedgpeth](https://github.com/anniehedgpeth)
+  - [Sean O'Meara](https://github.com/someara)
+  - [Nell Shamrell-Harrington](https://github.com/nellshamrell)
+- [2016](https://blog.chef.io/2016/08/31/awesome-community-chefs-2016/)
+  - [Mike Fiedler](https://github.com/miketheman)
+  - [Doug Ireton](https://github.com/dougireton)
+  - [Stuart Preston](https://github.com/stuartpreston)
+  - [Seth Thomas](https://github.com/cheeseplus)
+- 2015
+  - [Jon Cowie](https://github.com/jonlives)
+  - [Noah Kantrowitz](https://github.com/coderanger)
+  - [Matt Wrock](https://github.com/mwrock)
+- 2014
+  - [Ranjib Dey](https://github.com/ranjib)
+  - [Miah Johnson](https://github.com/miah)
+  - [Seth Vargo](https://github.com/sethvargo)
+  - [Eric Wolfe](https://github.com/atomic-penguin)
+- 2013
+  - [Bryan Berry](https://github.com/bryanwb)
+  - [Fletcher Nichol](https://github.com/fnichol)
+  - [Jamie Winsor](https://github.com/reset)
+
+## Hall of Fame
 
 After receiving three MVP awards, we add someone to the hall of fame. We want to express our gratitude to their continuing participation and give newer community members the opportunity to be recognized.
 
-* Matthew Kent
-* Doug MacEachern
-* Tollef Fog Heen
-* Thom May
-* Bryan Berry
-* Bryan McLellan
-* Jeff Blaine
-* Nathen Harvey
+- Matthew Kent
+- Doug MacEachern
+- Tollef Fog Heen
+- Thom May
+- Bryan Berry
+- Bryan McLellan
+- Jeff Blaine
 
-#### The MVP recipients
+## The MVP recipients
 
 | Release | Date | MVP |
 |---------|------|-----|
@@ -91,44 +145,3 @@ After receiving three MVP awards, we add someone to the hall of fame. We want to
 | [Chef 0.5.4](https://www.chef.io/blog/2009/02/13/chef-0-5-4/) | 2009-02-13 | Arjuna Christensen |
 | [Chef 0.5.2](https://www.chef.io/blog/2009/02/01/chef-0-5-2-and-ohai-0-1-4/) | 2009-02-01 | Bryan McLellan |
 
-#### Awesome Community Chefs
-
-Each year at ChefConf, a number of individuals are awarded the Awesome Community Chef award. The Awesome Community Chef awards are a way for the community to recognize a few of the individuals who have made a dramatic impact and have helped further the cause.
-
-* 2013
-  * [Bryan Berry](https://github.com/bryanwb)
-  * [Fletcher Nichol](https://github.com/fnichol)
-  * [Jamie Winsor](https://github.com/reset)
-* 2014
-  * [Ranjib Dey](https://github.com/ranjib)
-  * [Miah Johnson](https://github.com/miah)
-  * [Seth Vargo](https://github.com/sethvargo)
-  * [Eric Wolfe](https://github.com/atomic-penguin)
-* 2015
-  * [Jon Cowie](https://github.com/jonlives)
-  * [Noah Kantrowitz](https://github.com/coderanger)
-  * [Matt Wrock](https://github.com/mwrock)
-* [2016](https://blog.chef.io/2016/08/31/awesome-community-chefs-2016/)
-  * [Mike Fiedler](https://github.com/miketheman)
-  * [Doug Ireton](https://github.com/dougireton)
-  * [Stuart Preston](https://github.com/stuartpreston)
-  * [Seth Thomas](https://github.com/cheeseplus)
-* [2017](https://blog.chef.io/2017/06/08/awesome-community-chefs-2017-award-winners/)
-  * [Ben Dang](https://github.com/bdangit)
-  * [Annie Hedgpeth](https://github.com/anniehedgpeth)
-  * [Sean O'Meara](https://github.com/someara)
-  * [Nell Shamrell-Harrington](https://github.com/nellshamrell)
-* [2018](https://blog.chef.io/2018/05/24/2018-awesome-community-chefs/)
-  * [Dan Webb](https://github.com/damacus)
-  * [Romain Sertelon](https://github.com/rsertelon)
-  * [Edmund Haselwanter](https://github.com/ehaselwanter)
-  * [Tim Smith](https://github.com/tas50)
-  * [Joshua Timberman](https://github.com/jtimberman)
-* [2019][USA](https://blog.chef.io/congratulations-to-our-2019-awesome-community-chefs/), [Europe](https://blog.chef.io/congratulations-to-our-chefconf-london-2019-award-winners/)
-  * [Graham Weldon](https://github.com/predominant)
-  * [Jason Field](https://github.com/xorima)
-  * [Joshua Basch](https://github.com/HT154)
-  * [Karl Fischer](https://github.com/kmf)
-  * [Nathen Harvey](https://github.com/NathenHarvey)
-  * [Robb Kidd](https://github.com/RobbKidd)
-  * [Tomas Heinen](https://github.com/tecracer-theinen)
diff --git a/Gemfile.lock b/Gemfile.lock
index a407e4980f..8540b3e407 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,12 +28,12 @@ GIT
 PATH
   remote: .
   specs:
-    chef (16.2.26)
+    chef (16.2.29)
       addressable
       bcrypt_pbkdf (= 1.1.0.rc1)
       bundler (>= 1.10)
-      chef-config (= 16.2.26)
-      chef-utils (= 16.2.26)
+      chef-config (= 16.2.29)
+      chef-utils (= 16.2.29)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
@@ -62,12 +62,12 @@ PATH
       train-winrm (>= 0.2.5)
       tty-screen (~> 0.6)
       uuidtools (~> 2.1.5)
-    chef (16.2.26-universal-mingw32)
+    chef (16.2.29-universal-mingw32)
       addressable
       bcrypt_pbkdf (= 1.1.0.rc1)
       bundler (>= 1.10)
-      chef-config (= 16.2.26)
-      chef-utils (= 16.2.26)
+      chef-config (= 16.2.29)
+      chef-utils (= 16.2.29)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
@@ -112,15 +112,15 @@ PATH
 PATH
   remote: chef-bin
   specs:
-    chef-bin (16.2.26)
-      chef (= 16.2.26)
+    chef-bin (16.2.29)
+      chef (= 16.2.29)
 
 PATH
   remote: chef-config
   specs:
-    chef-config (16.2.26)
+    chef-config (16.2.29)
       addressable
-      chef-utils (= 16.2.26)
+      chef-utils (= 16.2.29)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -129,7 +129,7 @@ PATH
 PATH
   remote: chef-utils
   specs:
-    chef-utils (16.2.26)
+    chef-utils (16.2.29)
 
 GEM
   remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 52a8279841..aa7f152b07 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.2.26
\ No newline at end of file
+16.2.29
\ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index f14b6e5430..721e107671 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
 
 module ChefBin
   CHEFBIN_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "16.2.26".freeze
+  VERSION = "16.2.29".freeze
 end
 
 #
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index f49406f08e..4ba2ccb99e 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
 
 module ChefConfig
   CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "16.2.26".freeze
+  VERSION = "16.2.29".freeze
 end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 7b9c64f4c7..a9c31f3011 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -15,5 +15,5 @@
 
 module ChefUtils
   CHEFUTILS_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "16.2.26".freeze
+  VERSION = "16.2.29".freeze
 end
diff --git a/lib/chef/knife/bootstrap/templates/chef-full.erb b/lib/chef/knife/bootstrap/templates/chef-full.erb
index b4f75720ac..5006009617 100644
--- a/lib/chef/knife/bootstrap/templates/chef-full.erb
+++ b/lib/chef/knife/bootstrap/templates/chef-full.erb
@@ -185,50 +185,50 @@ if test "x$tmp_dir" != "x"; then
   rm -r "$tmp_dir"
 fi
 
-mkdir -p <%= ChefConfig::Config.etc_chef_dir(false) %>
+mkdir -p /etc/chef
 
 <% if client_pem -%>
-(umask 077 && (cat > <%= ChefConfig::Config.etc_chef_dir(false) %>/client.pem <<'EOP'
+(umask 077 && (cat > /etc/chef/client.pem <<'EOP'
 <%= ::File.read(::File.expand_path(client_pem)) %>
 EOP
 )) || exit 1
 <% end -%>
 
 <% if validation_key -%>
-(umask 077 && (cat > <%= ChefConfig::Config.etc_chef_dir(false) %>/validation.pem <<'EOP'
+(umask 077 && (cat > /etc/chef/validation.pem <<'EOP'
 <%= validation_key %>
 EOP
 )) || exit 1
 <% end -%>
 
 <% if encrypted_data_bag_secret -%>
-(umask 077 && (cat > <%= ChefConfig::Config.etc_chef_dir(false) %>/encrypted_data_bag_secret <<'EOP'
+(umask 077 && (cat > /etc/chef/encrypted_data_bag_secret <<'EOP'
 <%= encrypted_data_bag_secret %>
 EOP
 )) || exit 1
 <% end -%>
 
 <% unless trusted_certs.empty? -%>
-mkdir -p <%= ChefConfig::Config.etc_chef_dir(false) %>/trusted_certs
+mkdir -p /etc/chef/trusted_certs
 <%= trusted_certs %>
 <% end -%>
 
 <%# Generate Ohai Hints -%>
 <% unless @config[:hints].nil? || @config[:hints].empty? -%>
-mkdir -p <%= ChefConfig::Config.etc_chef_dir(false) %>/ohai/hints
+mkdir -p /etc/chef/ohai/hints
 
 <% @config[:hints].each do |name, hash| -%>
-cat > <%= ChefConfig::Config.etc_chef_dir(false) %>/ohai/hints/<%= name %>.json <<'EOP'
+cat > /etc/chef/ohai/hints/<%= name %>.json <<'EOP'
 <%= Chef::JSONCompat.to_json(hash) %>
 EOP
 <% end -%>
 <% end -%>
 
-cat > <%= ChefConfig::Config.etc_chef_dir(false) %>/client.rb <<'EOP'
+cat > /etc/chef/client.rb <<'EOP'
 <%= config_content %>
 EOP
 
-cat > <%= ChefConfig::Config.etc_chef_dir(false) %>/first-boot.json <<'EOP'
+cat > /etc/chef/first-boot.json <<'EOP'
 <%= Chef::JSONCompat.to_json(first_boot) %>
 EOP
 
diff --git a/lib/chef/provider/script.rb b/lib/chef/provider/script.rb
index 71b86e8657..8e4951bbcb 100644
--- a/lib/chef/provider/script.rb
+++ b/lib/chef/provider/script.rb
@@ -16,9 +16,7 @@
 # limitations under the License.
 #
 
-require "tempfile" unless defined?(Tempfile)
 require_relative "execute"
-require_relative "../win32/security" if ChefUtils.windows?
 require "forwardable" unless defined?(Forwardable)
 
 class Chef
diff --git a/lib/chef/provider/windows_script.rb b/lib/chef/provider/windows_script.rb
index 4a17a6ff1a..a93319a35a 100644
--- a/lib/chef/provider/windows_script.rb
+++ b/lib/chef/provider/windows_script.rb
@@ -18,6 +18,8 @@
 
 require_relative "script"
 require_relative "../mixin/windows_architecture_helper"
+require_relative "../win32/security" if ChefUtils.windows?
+require "tempfile" unless defined?(Tempfile)
 
 class Chef
   class Provider
diff --git a/lib/chef/resource/bash.rb b/lib/chef/resource/bash.rb
index 98d110eb1b..bf59c87a9e 100644
--- a/lib/chef/resource/bash.rb
+++ b/lib/chef/resource/bash.rb
@@ -17,7 +17,6 @@
 #
 
 require_relative "script"
-require_relative "../provider/script"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/batch.rb b/lib/chef/resource/batch.rb
index a524737abe..4a9935a920 100644
--- a/lib/chef/resource/batch.rb
+++ b/lib/chef/resource/batch.rb
@@ -27,8 +27,10 @@ class Chef
 
       description "Use the **batch** resource to execute a batch script using the cmd.exe interpreter on Windows. The batch resource creates and executes a temporary file (similar to how the script resource behaves), rather than running the command inline. Commands that are executed with this resource are (by their nature) not idempotent, as they are typically unique to the environment in which they are run. Use not_if and only_if to guard this resource for idempotence."
 
-      def initialize(name, run_context = nil)
-        super(name, run_context, nil, "cmd.exe")
+      def initialize(*args)
+        super
+        @interpreter = "cmd.exe"
+        @default_guard_interpreter = resource_name
       end
 
     end
diff --git a/lib/chef/resource/csh.rb b/lib/chef/resource/csh.rb
index 82c695edc7..6bfb4ddf8e 100644
--- a/lib/chef/resource/csh.rb
+++ b/lib/chef/resource/csh.rb
@@ -17,7 +17,6 @@
 #
 
 require_relative "script"
-require_relative "../provider/script"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/perl.rb b/lib/chef/resource/perl.rb
index bf8b43429f..21f9755bc5 100644
--- a/lib/chef/resource/perl.rb
+++ b/lib/chef/resource/perl.rb
@@ -17,7 +17,6 @@
 #
 
 require_relative "script"
-require_relative "../provider/script"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/powershell_script.rb b/lib/chef/resource/powershell_script.rb
index 434f9ca09f..a334f945e3 100644
--- a/lib/chef/resource/powershell_script.rb
+++ b/lib/chef/resource/powershell_script.rb
@@ -48,8 +48,10 @@ class Chef
                   " idempotent, as they are typically unique to the environment in which they are run. Use not_if"\
                   " and only_if to guard this resource for idempotence."
 
-      def initialize(name, run_context = nil)
-        super(name, run_context, :powershell_script, "powershell.exe")
+      def initialize(*args)
+        super
+        @interpreter = "powershell.exe"
+        @default_guard_interpreter = resource_name
         @convert_boolean_return = false
       end
 
diff --git a/lib/chef/resource/python.rb b/lib/chef/resource/python.rb
index 6a9974246d..6c2aeee4b8 100644
--- a/lib/chef/resource/python.rb
+++ b/lib/chef/resource/python.rb
@@ -16,7 +16,6 @@
 #
 
 require_relative "script"
-require_relative "../provider/script"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/ruby.rb b/lib/chef/resource/ruby.rb
index 43e861318e..ba5aec103b 100644
--- a/lib/chef/resource/ruby.rb
+++ b/lib/chef/resource/ruby.rb
@@ -17,7 +17,6 @@
 #
 
 require_relative "script"
-require_relative "../provider/script"
 
 class Chef
   class Resource
diff --git a/lib/chef/resource/windows_script.rb b/lib/chef/resource/windows_script.rb
index 353264c617..8c958c5cba 100644
--- a/lib/chef/resource/windows_script.rb
+++ b/lib/chef/resource/windows_script.rb
@@ -16,34 +16,20 @@
 # limitations under the License.
 #
 
-require_relative "../platform/query_helpers"
 require_relative "script"
 require_relative "../mixin/windows_architecture_helper"
 
 class Chef
   class Resource
     class WindowsScript < Chef::Resource::Script
-      unified_mode true
+      include Chef::Mixin::WindowsArchitectureHelper
 
-      provides :windows_script
+      unified_mode true
 
       # This is an abstract resource meant to be subclasses; thus no 'provides'
 
       set_guard_inherited_attributes(:architecture)
 
-      protected
-
-      def initialize(name, run_context, resource_name, interpreter_command)
-        super(name, run_context)
-        @interpreter = interpreter_command
-        @resource_name = resource_name if resource_name
-        @default_guard_interpreter = self.resource_name
-      end
-
-      include Chef::Mixin::WindowsArchitectureHelper
-
-      public
-
       def architecture(arg = nil)
         assert_architecture_compatible!(arg) unless arg.nil?
         result = set_or_return(
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f8c96240fc..61c2d00166 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = Chef::VersionString.new("16.2.26")
+  VERSION = Chef::VersionString.new("16.2.29")
 end
 
 #
diff --git a/spec/support/shared/unit/execute_resource.rb b/spec/support/shared/unit/execute_resource.rb
index ffefa8d63a..bec3a047c0 100644
--- a/spec/support/shared/unit/execute_resource.rb
+++ b/spec/support/shared/unit/execute_resource.rb
@@ -75,7 +75,7 @@ shared_examples_for "an execute resource" do
   end
 
   it "the old path property (that never worked) is not supported in chef >= 13" do
-    expect { @resource.path [ "woot" ] }.to raise_error
+    expect(@resource).not_to respond_to(:path)
   end
 
   it "should accept an integer for the return code" do
diff --git a/spec/unit/resource/timezone_spec.rb b/spec/unit/resource/timezone_spec.rb
index 6461ae5d67..da48ab7c16 100644
--- a/spec/unit/resource/timezone_spec.rb
+++ b/spec/unit/resource/timezone_spec.rb
@@ -34,6 +34,6 @@ describe Chef::Resource::Timezone do
 
   it "supports the :set action only" do
     expect { resource.action :set }.not_to raise_error
-    expect { resource.action :unset }.to raise_error
+    expect { resource.action :unset }.to raise_error(Chef::Exceptions::ValidationFailed)
   end
 end