app-admin/puppet: actually fix 6.10.1 patching

Bug: https://bugs.gentoo.org/697982
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>

1 files changed, 19 insertions, 88 deletions

diff --git a/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch b/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch
index adb9e8dd7d40..daa065dabb5c 100644
--- a/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch
+++ b/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch
@@ -1,88 +1,19 @@
-***** puppet-fix-tests-6.4.1.patch *****
-PWD: /var/tmp/portage/app-admin/puppet-6.10.1/work/all/puppet-6.10.1
-PATCH TOOL: patch -> /usr/bin/patch
-VERSION INFO:
-GNU patch 2.7.6
-Copyright (C) 2003, 2009-2012 Free Software Foundation, Inc.
-Copyright (C) 1988 Larry Wall
-
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law.
-
-Written by Larry Wall and Paul Eggert
-
-========================================
-
-PATCH COMMAND:  patch -p0 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/var/tmp/portage/app-admin/puppet-6.10.1/files/puppet-fix-tests-6.4.1.patch'
-
-========================================
-checking file spec/unit/network/http/api/indirected_routes_spec.rb
-Hunk #1 FAILED at 144.
-1 out of 1 hunk FAILED
-
-patch program exited with status 1
-========================================
-
-PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/var/tmp/portage/app-admin/puppet-6.10.1/files/puppet-fix-tests-6.4.1.patch'
-
-========================================
-can't find file to patch at input line 3
-Perhaps you used the wrong -p or --strip option?
-The text leading up to this was:
---------------------------
-|--- spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-17 19:36:56.000000000 -0500
-|+++ spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-19 10:52:35.841614932 -0500
---------------------------
-No file to patch.  Skipping patch.
-1 out of 1 hunk ignored
-
-patch program exited with status 1
-========================================
-
-PATCH COMMAND:  patch -p2 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/var/tmp/portage/app-admin/puppet-6.10.1/files/puppet-fix-tests-6.4.1.patch'
-
-========================================
-can't find file to patch at input line 3
-Perhaps you used the wrong -p or --strip option?
-The text leading up to this was:
---------------------------
-|--- spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-17 19:36:56.000000000 -0500
-|+++ spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-19 10:52:35.841614932 -0500
---------------------------
-No file to patch.  Skipping patch.
-1 out of 1 hunk ignored
-
-patch program exited with status 1
-========================================
-
-PATCH COMMAND:  patch -p3 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/var/tmp/portage/app-admin/puppet-6.10.1/files/puppet-fix-tests-6.4.1.patch'
-
-========================================
-can't find file to patch at input line 3
-Perhaps you used the wrong -p or --strip option?
-The text leading up to this was:
---------------------------
-|--- spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-17 19:36:56.000000000 -0500
-|+++ spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-19 10:52:35.841614932 -0500
---------------------------
-No file to patch.  Skipping patch.
-1 out of 1 hunk ignored
-
-patch program exited with status 1
-========================================
-
-PATCH COMMAND:  patch -p4 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/var/tmp/portage/app-admin/puppet-6.10.1/files/puppet-fix-tests-6.4.1.patch'
-
-========================================
-can't find file to patch at input line 3
-Perhaps you used the wrong -p or --strip option?
-The text leading up to this was:
---------------------------
-|--- spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-17 19:36:56.000000000 -0500
-|+++ spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-19 10:52:35.841614932 -0500
---------------------------
-No file to patch.  Skipping patch.
-1 out of 1 hunk ignored
-
-patch program exited with status 1
+--- spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-17 19:36:56.000000000 -0500
++++ spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-19 10:52:35.841614932 -0500
+@@ -158,16 +158,6 @@
+       handler.uri2indirection("GET", uri_escaped, params)
+     end
+ 
+-    it "when the environment is unknown should remove :environment from params passed to check_authorization and therefore fail" do
+-      expect(handler).to receive(:check_authorization).with(anything,
+-                                                            anything,
+-                                                            excluding(:environment))
+-      expect { handler.uri2indirection("GET",
+-                                       "#{master_url_prefix}/node/bar",
+-                                       {:environment => 'bogus'})
+-      }.to raise_error(not_found_error)
+-    end
+-
+     it "should not URI unescape the indirection key as passed through to a call to check_authorization" do
+       expect(handler).to receive(:check_authorization).with(anything, anything, hash_including(environment: be_a(Puppet::Node::Environment).and(have_attributes(name: :env))))
+