gentoo resync : 28.04.2019

1 files changed, 18 insertions, 0 deletions

diff --git a/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch b/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch
new file mode 100644
index 000000000000..6b7b5b484792
--- /dev/null
+++ b/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch
@@ -0,0 +1,18 @@
+--- 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
+@@ -144,15 +144,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(lambda { 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))))
+