summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2019-12-02 10:41:10 -0800
committerTim Smith <tsmith84@gmail.com>2019-12-02 10:41:10 -0800
commit23df848b683b1197a2a20ea01f02eaf2f7818940 (patch)
tree750178a819fde02d4d562adf3b3cfec2123b5b38
parent7c040c5b3229523e9983aa07c182ea6182a5a032 (diff)
downloadchef-23df848b683b1197a2a20ea01f02eaf2f7818940.tar.gz
Remove duplicate reboot test
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--spec/functional/dsl/reboot_pending_spec.rb23
1 files changed, 2 insertions, 21 deletions
diff --git a/spec/functional/dsl/reboot_pending_spec.rb b/spec/functional/dsl/reboot_pending_spec.rb
index ff7fd574b1..89701802b3 100644
--- a/spec/functional/dsl/reboot_pending_spec.rb
+++ b/spec/functional/dsl/reboot_pending_spec.rb
@@ -36,7 +36,7 @@ describe Chef::DSL::RebootPending, :windows_only do
let(:reg_key) { nil }
let(:original_set) { false }
- before(:all) { @any_flag = Hash.new }
+ before(:all) { @any_flag = {} }
after { @any_flag[reg_key] = original_set }
@@ -47,7 +47,7 @@ describe Chef::DSL::RebootPending, :windows_only do
it "returns true if the registry value exists" do
skip "found existing registry key" if original_set
registry.set_value(reg_key,
- { name: "PendingFileRenameOperations", type: :multi_string, data: ['\??\C:\foo.txt|\??\C:\bar.txt'] })
+ { name: "PendingFileRenameOperations", type: :multi_string, data: ['\??\C:\foo.txt|\??\C:\bar.txt'] })
expect(recipe.reboot_pending?).to be_truthy
end
@@ -59,25 +59,6 @@ describe Chef::DSL::RebootPending, :windows_only do
end
end
- describe 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired' do
- let(:reg_key) { 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired' }
- let(:original_set) { registry.key_exists?(reg_key) }
-
- it "returns true if the registry key exists" do
- skip "found existing registry key" if original_set
- pending "Permissions are limited to 'TrustedInstaller' by default"
- registry.create_key(reg_key, false)
-
- expect(recipe.reboot_pending?).to be_truthy
- end
-
- after do
- unless original_set
- registry.delete_key(reg_key, false)
- end
- end
- end
-
describe 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired' do
let(:reg_key) { 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired' }
let(:original_set) { registry.key_exists?(reg_key) }