summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2017-07-10 09:27:56 -0700
committerGitHub <noreply@github.com>2017-07-10 09:27:56 -0700
commitb6f4e3331ad683d5460921436836c83dbff12275 (patch)
treed7f4b29f03f92ddad545ed4a83061ba5a4f5000e
parentf16ebec744dd40fba625e9123647d722f1fefece (diff)
parente5390d0fae9a471b86d8a5bf3871365fcb358822 (diff)
downloadchef-b6f4e3331ad683d5460921436836c83dbff12275.tar.gz
Merge pull request #6251 from chef/lcg/acceptance-fix
acceptance tests are (ab)using our internal ruby
-rw-r--r--acceptance/data-collector/.acceptance/data-collector-test/recipes/default.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/acceptance/data-collector/.acceptance/data-collector-test/recipes/default.rb b/acceptance/data-collector/.acceptance/data-collector-test/recipes/default.rb
index 20b945db9b..2ba4fe81fc 100644
--- a/acceptance/data-collector/.acceptance/data-collector-test/recipes/default.rb
+++ b/acceptance/data-collector/.acceptance/data-collector-test/recipes/default.rb
@@ -1,3 +1,7 @@
+
+oldpath = ENV["PATH"]
+ENV["PATH"] = "/opt/chef/embedded/bin:#{ENV["PATH"]}"
+
api_root_dir = "/var/opt/data_collector_api"
directory api_root_dir do
@@ -36,3 +40,5 @@ directory "/etc/chef"
source "client-rb-#{config_file}.rb"
end
end
+
+ENV["PATH"] = oldpath