diff options
author | Bryan McLellan <btm@loftninjas.org> | 2014-12-17 12:12:49 -0500 |
---|---|---|
committer | Bryan McLellan <btm@loftninjas.org> | 2014-12-17 12:12:49 -0500 |
commit | 0b27affcdb9145b3bd133948bab0b38fb7481a0c (patch) | |
tree | 0a71f9353cfaee3458fcb7bbd125b4a1f6f985e4 /spec/functional/resource/registry_spec.rb | |
parent | 34a8affc37f80e6a742dbe8a130513897e6512a8 (diff) | |
parent | 2e7ffaa7d83343379476fd353cb2f5a351ba090e (diff) | |
download | chef-0b27affcdb9145b3bd133948bab0b38fb7481a0c.tar.gz |
Merge pull request #2661 from opscode/btm/appveyor11.18.0.r
Combination of all current PRs against master to get appveyor passing. Closes #2655, #2653, #2644, #2670.
Diffstat (limited to 'spec/functional/resource/registry_spec.rb')
-rw-r--r-- | spec/functional/resource/registry_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/functional/resource/registry_spec.rb b/spec/functional/resource/registry_spec.rb index d3120ac77c..f112ad9b00 100644 --- a/spec/functional/resource/registry_spec.rb +++ b/spec/functional/resource/registry_spec.rb @@ -40,7 +40,7 @@ describe Chef::Resource::RegistryKey, :unix_only do end end -describe Chef::Resource::RegistryKey, :windows_only, :pending => "Refactor helper methods" do +describe Chef::Resource::RegistryKey, :windows_only, :broken => true do # parent and key must be single keys, not paths let(:parent) { 'Opscode' } |