diff options
| author | Bryan McLellan <btm@loftninjas.org> | 2020-04-06 14:25:52 -0400 |
|---|---|---|
| committer | Bryan McLellan <btm@loftninjas.org> | 2020-04-06 15:05:02 -0400 |
| commit | 492f31d88989ddcd7e06c4d9638d4d47a9d36353 (patch) | |
| tree | f802278f7028f147c150c43c048389dee26121f8 | |
| parent | 7696937f41e3476547e68b2e0ea20641eb10a0f2 (diff) | |
| download | chef-btm/really-skip-reboot-test.tar.gz | |
Really skip the reboot pending func test if a reboot is pendingbtm/really-skip-reboot-test
This looks like it never worked but we happened to never run into it until we added a desktop platform to the pipeline.
Signed-off-by: Bryan McLellan <btm@loftninjas.org>
| -rw-r--r-- | spec/functional/dsl/reboot_pending_spec.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/spec/functional/dsl/reboot_pending_spec.rb b/spec/functional/dsl/reboot_pending_spec.rb index 89701802b3..4e1ad858ad 100644 --- a/spec/functional/dsl/reboot_pending_spec.rb +++ b/spec/functional/dsl/reboot_pending_spec.rb @@ -17,10 +17,13 @@ # require "chef/dsl/reboot_pending" +require "chef/dsl/registry_helper" require "chef/win32/registry" require "spec_helper" describe Chef::DSL::RebootPending, :windows_only do + include Chef::DSL::RegistryHelper + def run_ohai node.consume_external_attrs(OHAI_SYSTEM.data, {}) end @@ -79,7 +82,9 @@ describe Chef::DSL::RebootPending, :windows_only do describe "when there is nothing to indicate a reboot is pending" do it "should return false" do - skip "reboot pending" if @any_flag.any? { |_, v| v == true } + skip "reboot pending" if registry_value_exists?('HKLM\SYSTEM\CurrentControlSet\Control\Session Manager', { name: "PendingFileRenameOperations" }) || + registry_key_exists?('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired') || + registry_key_exists?('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending') expect(recipe.reboot_pending?).to be_falsey end end |