From 6b8130ad431fd61ce865734e7172efc3e0eba672 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Tue, 25 Apr 2017 19:04:04 -0700 Subject: major testing overhaul See the PR comments for more philosophical background. This simplifies the external tests. The major feature here is that halite, poise, chefspec, etc are removed from the Gemfile.lock and the transitive Gemfile splicing is gone from the external tests. We're back to simply tracking master on external projects and bundle installing without locks and going red if the break. Those external projects should all similarly track master of chef/chef to reduce the possibility that they break us here. This also bumps bundler to 1.14.x and unblocks us there. It continues to simplify our use of bundler to be more mainstream and less impenetrable. There was some crazy shit that I found where I had to remove env vars like BUNDLE_ENABLE_TRAMPOLINE and the BUNDLE_IGNORE_CONFIG and BUNDLE_FROZEN env vars in appveyor along with the .bundle/config frozen setting were necessary to unbreak appveyor. We seem to have gotten very far afield of standard bundler usage and it was breaking in strange to debug ways. Oddly enough this exposed weird errors in the chef-config/spec/units/fips_spec.rb tests where we need to require the "win32/registry" file there now even though I can't figure out why that broke or how it was working previously. Also, adding x64-mingw32 to x86-mingw32 was necessary to test in appveyor on 64-bit windows (I tried universal-mingw32 and that failed) which seems obvious and is another case that I don't understand how it was working in bundler 1.12.x Signed-off-by: Lamont Granquist --- chef-config/spec/unit/fips_spec.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'chef-config/spec') 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 () -# 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" } -- cgit v1.2.1