diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-02-26 15:28:51 -0800 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2018-02-26 15:28:51 -0800 |
commit | 87ed3914d735a2c486900a86bb7ab66bc8ad08d3 (patch) | |
tree | d48b51382fb6734d031b247ff5bce40a0c4d161a /spec/integration | |
parent | dd4ee7acf0044e6e9c0400d13a980c446dc3f529 (diff) | |
download | chef-87ed3914d735a2c486900a86bb7ab66bc8ad08d3.tar.gz |
fix legacy mode and legacy mode tests
also more broadly applies the integration tests to legacy mode which was
the original intent of the chef-solo tests in client_spec.rb here
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'spec/integration')
-rw-r--r-- | spec/integration/client/client_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/integration/client/client_spec.rb b/spec/integration/client/client_spec.rb index 730e304bd5..77008524c8 100644 --- a/spec/integration/client/client_spec.rb +++ b/spec/integration/client/client_spec.rb @@ -46,7 +46,7 @@ describe "chef-client" do # we're running `chef-client` from the source tree and not the external one. # cf. CHEF-4914 let(:chef_client) { "ruby '#{chef_dir}/chef-client' --minimal-ohai" } - let(:chef_solo) { "ruby '#{chef_dir}/chef-solo' --minimal-ohai" } + let(:chef_solo) { "ruby '#{chef_dir}/chef-solo' --legacy-mode --minimal-ohai" } let(:critical_env_vars) { %w{_ORIGINAL_GEM_PATH GEM_PATH GEM_HOME GEM_ROOT BUNDLE_BIN_PATH BUNDLE_GEMFILE RUBYLIB RUBYOPT RUBY_ENGINE RUBY_ROOT RUBY_VERSION PATH}.map { |o| "#{o}=#{ENV[o]}" } .join(" ") } |