diff options
| author | Tim Smith <tsmith@chef.io> | 2020-04-07 11:08:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-07 11:08:32 -0700 |
| commit | a24c03abc4c5906b65f26816e209427269ec3d19 (patch) | |
| tree | 0e47735c61ae2feb10bdd239e60df077e713561d | |
| parent | 8292fc66db66ad80abd3d968b19f97ea4e1bf1dc (diff) | |
| parent | 8f685f5ad4fb96f12f5d63f41d9c934847901b2f (diff) | |
| download | chef-a24c03abc4c5906b65f26816e209427269ec3d19.tar.gz | |
Merge pull request #9619 from chef/ohai_1415
Update Ohai to 14.15
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 2 | ||||
| -rw-r--r-- | spec/functional/dsl/reboot_pending_spec.rb | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 11d36999d7..44e222fc05 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -168,7 +168,7 @@ GEM mixlib-archive (1.0.5-universal-mingw32) mixlib-log mixlib-authentication (2.1.1) - mixlib-cli (2.1.5) + mixlib-cli (2.1.6) mixlib-config (3.0.6) tomlrb mixlib-log (3.0.8) @@ -190,7 +190,7 @@ GEM net-ssh (>= 2.6.5) net-ssh-gateway (>= 1.2.0) net-telnet (0.1.1) - ohai (14.14.0) + ohai (14.15.0) chef-config (>= 12.8, < 15) ffi (~> 1.9) ffi-yajl (~> 2.2) @@ -224,7 +224,7 @@ GEM pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (4.0.3) + public_suffix (4.0.4) rack (2.2.2) rainbow (3.0.0) rake (12.3.0) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index d154708697..f41ec90ed1 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -240,7 +240,7 @@ GEM octokit (4.18.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - ohai (14.14.0) + ohai (14.15.0) chef-config (>= 12.8, < 15) ffi (~> 1.9) ffi-yajl (~> 2.2) diff --git a/spec/functional/dsl/reboot_pending_spec.rb b/spec/functional/dsl/reboot_pending_spec.rb index 09f587a1bc..27169c8f5a 100644 --- a/spec/functional/dsl/reboot_pending_spec.rb +++ b/spec/functional/dsl/reboot_pending_spec.rb @@ -79,8 +79,8 @@ 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 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') + 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 |