summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@loftninjas.org>2020-04-03 14:07:07 -0400
committerBryan McLellan <btm@loftninjas.org>2020-04-03 14:07:07 -0400
commitc888385ead9f9b487440d9bc58ac6d43bce1ed89 (patch)
treee90b5953500680d5c8620c6cae2b5ac7f772f31a
parent4137201de98625b0b5a593fe99b61f9c9466e7ef (diff)
downloadchef-c888385ead9f9b487440d9bc58ac6d43bce1ed89.tar.gz
Remove a complex test that is breaking
We removed this in master in 688b72f47b4c3a23ca042336ea6c5d1f215ec263 lamont said: > yeah i never figured out how to make that work > yeah we have to bundle exec above that > and i never figured out how to make that env mangling test correctly from within the bundle exec, and wound up just deleting it > i think i validated it still worked manually and then nuked the test > it is a pretty deeply weird test Signed-off-by: Bryan McLellan <btm@loftninjas.org>
-rw-r--r--Gemfile.lock8
-rw-r--r--spec/integration/client/client_spec.rb16
2 files changed, 4 insertions, 20 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 6cdb36e0c3..957e07f29c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -121,9 +121,9 @@ GEM
multipart-post (>= 1.2, < 3)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
- ffi (1.12.1)
- ffi (1.12.1-x64-mingw32)
- ffi (1.12.1-x86-mingw32)
+ ffi (1.12.2)
+ ffi (1.12.2-x64-mingw32)
+ ffi (1.12.2-x86-mingw32)
ffi-win32-extensions (1.0.3)
ffi
ffi-yajl (2.3.3)
@@ -235,7 +235,7 @@ GEM
rspec-mocks (~> 3.9.0)
rspec-core (3.9.1)
rspec-support (~> 3.9.1)
- rspec-expectations (3.9.0)
+ rspec-expectations (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-its (1.3.0)
diff --git a/spec/integration/client/client_spec.rb b/spec/integration/client/client_spec.rb
index d0041de054..f026559ee7 100644
--- a/spec/integration/client/client_spec.rb
+++ b/spec/integration/client/client_spec.rb
@@ -60,22 +60,6 @@ describe "chef-client" do
shell_out!("#{chef_client} -c \"#{path_to("config/client.rb")}\" -o 'x::default'", cwd: chef_dir)
end
- it "should complete successfully with no other environment variables", skip: (Chef::Platform.windows?) do
- file "config/client.rb", <<~EOM
- local_mode true
- cookbook_path "#{path_to("cookbooks")}"
- EOM
-
- begin
- result = shell_out("env -i #{critical_env_vars} #{chef_client} -c \"#{path_to("config/client.rb")}\" -o 'x::default'", cwd: chef_dir)
- result.error!
- rescue
- Chef::Log.info "Bare invocation will have the following load-path."
- Chef::Log.info shell_out!("env -i #{critical_env_vars} ruby -e 'puts $:'").stdout
- raise
- end
- end
-
it "should complete successfully with --no-listen" do
file "config/client.rb", <<~EOM
local_mode true