[DRE-commits] [chef] 01/01: Unset http[s]_proxy in the subversion spec, so it doesn't alter generated subversion commands.

[Stefano Rivera]

This is an automated email from the git hooks/post-receive script.

stefanor pushed a commit to branch master
in repository chef.

commit 873b5f16fde4d4fe305b3131ded3be89cc62b89a
Author: Stefano Rivera <stefanor at debian.org>
Date:   Sun Nov 20 11:43:25 2016 +0100

    Unset http[s]_proxy in the subversion spec, so it doesn't alter generated subversion commands.
---
 debian/changelog           |  2 ++
 debian/patches/series      |  1 +
 debian/patches/svn-proxies | 25 +++++++++++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1bd23b2..ccbc2ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ chef (12.14.60-3) UNRELEASED; urgency=medium
   * Be more verbose on failure, and tighten the pgrep to avoid catching
     "systemd-cgroups-agent chef-client.service" after stopping.
     (Patch from Ubuntu)
+  * Unset http[s]_proxy in the subversion spec, so it doesn't alter generated
+    subversion commands.
 
  -- Stefano Rivera <stefanor at debian.org>  Tue, 15 Nov 2016 12:04:08 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 5bbb3c1..a22557d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Update-gemspec-file.patch
 0002-spec-work-against-source-checkout-and-installed-pack.patch
 0003-Accept-rspec-3.4.patch
+svn-proxies
diff --git a/debian/patches/svn-proxies b/debian/patches/svn-proxies
new file mode 100644
index 0000000..18b6350
--- /dev/null
+++ b/debian/patches/svn-proxies
@@ -0,0 +1,25 @@
+Description: Remove proxy env vars before SVN tests
+ SVN commands are affected by proxy config
+Author: Stefano Rivera <stefanor at debian.org>
+Forwarded: https://github.com/chef/chef/pull/5562
+
+diff --git a/spec/unit/provider/subversion_spec.rb b/spec/unit/provider/subversion_spec.rb
+index ac2a8dd..418eb2a 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/chef.git