summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Davis <ryand-ruby@zenspider.com>2020-03-06 17:42:41 -0800
committerTim Smith <tsmith84@gmail.com>2020-03-16 11:56:22 -0700
commitf07e44418af0f6e577ba43baec8579ae840446ce (patch)
tree768a845ab4153ef5138e33e195a183e68e1068fb
parent80c992553269793e214fb2f72180c27630206e9d (diff)
downloadchef-f07e44418af0f6e577ba43baec8579ae840446ce.tar.gz
Remove warnings on test runs
1. Bundler.with_clean_env is deprecated. Switched to with_unbundled_env. 2. When we test for win32/daemon existance, redir to dev/null. Signed-off-by: Ryan Davis <zenspider@chef.io>
-rw-r--r--spec/support/chef_helpers.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/chef_helpers.rb b/spec/support/chef_helpers.rb
index 4ac6102887..e5371e60a9 100644
--- a/spec/support/chef_helpers.rb
+++ b/spec/support/chef_helpers.rb
@@ -63,9 +63,9 @@ end
# win32/service gem. windows_service_manager tests create a windows
# service that starts with the system ruby and requires this gem.
def system_windows_service_gem?
- windows_service_gem_check_command = %q{ruby -r "win32/daemon" -e ":noop"}
+ windows_service_gem_check_command = %{ruby -r "win32/daemon" -e ":noop" > #{DEV_NULL} 2>&1}
if defined?(Bundler)
- Bundler.with_clean_env do
+ Bundler.with_unbundled_env do
# This returns true if the gem can be loaded
system(windows_service_gem_check_command)
end