summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@loftninjas.org>2016-12-06 16:54:53 -0500
committerGitHub <noreply@github.com>2016-12-06 16:54:53 -0500
commit027f44625ce8e9de9d05e1aae9083400d0023215 (patch)
tree0c0b50f9b7383ec320f17139b370e737897b3ce4
parent66092cb7e62106619ce3e32dda5b0717868ebb45 (diff)
parentba5f4ea69ac06b6a5ebd237d95b217203211e3dc (diff)
downloadchef-027f44625ce8e9de9d05e1aae9083400d0023215.tar.gz
Merge pull request #5562 from stefanor/svn-http-proxy
Unset http[s]_proxy in the subversion spec
-rw-r--r--spec/unit/provider/subversion_spec.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/spec/unit/provider/subversion_spec.rb b/spec/unit/provider/subversion_spec.rb
index ac2a8dd754..a4ab4ae42c 100644
--- a/spec/unit/provider/subversion_spec.rb
+++ b/spec/unit/provider/subversion_spec.rb
@@ -32,6 +32,15 @@ describe Chef::Provider::Subversion do
@events = Chef::EventDispatch::Dispatcher.new
@run_context = Chef::RunContext.new(@node, {}, @events)
@provider = Chef::Provider::Subversion.new(@resource, @run_context)
+ @original_env = ENV.to_hash
+ # Generated command lines would include any environmental proxies
+ ENV.delete("http_proxy")
+ ENV.delete("https_proxy")
+ end
+
+ after do
+ ENV.clear
+ ENV.update(@original_env)
end
it "converts resource attributes to options for run_command and popen4" do