diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-04-27 02:26:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-27 02:26:29 -0500 |
| commit | 919b096e9da79bc11ed2b9508623c3562c50ce1b (patch) | |
| tree | 4227b7e64bdaa566788557d1d1fb67e8e491ed42 /chef-config | |
| parent | 122f2804f573977f9d88d4987988cd68ba785bed (diff) | |
| parent | 6b8130ad431fd61ce865734e7172efc3e0eba672 (diff) | |
| download | chef-919b096e9da79bc11ed2b9508623c3562c50ce1b.tar.gz | |
Merge pull request #6079 from chef/lcg/simplify-external-tests
simplify external tests, finally bump bundler, remove massive Gemfile.lock closure over poise+halite+chefspec+etc
Diffstat (limited to 'chef-config')
| -rw-r--r-- | chef-config/spec/unit/fips_spec.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chef-config/spec/unit/fips_spec.rb b/chef-config/spec/unit/fips_spec.rb index cf5af22ef1..d53096cead 100644 --- a/chef-config/spec/unit/fips_spec.rb +++ b/chef-config/spec/unit/fips_spec.rb @@ -1,6 +1,6 @@ # # Author:: Matt Wrock (<matt@mattwrock.com>) -# Copyright:: Copyright (c) 2016 Chef Software, Inc. +# Copyright:: Copyright (c) 2016-2017, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -19,6 +19,12 @@ require "chef-config/fips" require "spec_helper" +begin + require "win32/registry" +rescue LoadError + # not on unix +end + RSpec.describe "ChefConfig.fips?" do let(:enabled) { "0" } |