commit: 4c0d558d89fdb1be842f5cdfe98c779116ca0ba4 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Mon Dec 23 06:48:31 2019 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Mon Dec 23 10:15:23 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c0d558d
app-admin/puppet: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/14100 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Signed-off-by: David Seifert <soap <AT> gentoo.org> app-admin/puppet/files/puppet-fix-tests-5.5.14.patch | 18 ------------------ app-admin/puppet/files/puppet-fix-tests-6.4.1.patch | 18 ------------------ 2 files changed, 36 deletions(-) diff --git a/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch b/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch deleted file mode 100644 index 09ffe07da1a..00000000000 --- a/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- puppet/spec/unit/network/http/api/indirected_routes_spec.rb -+++ puppet/spec/unit/network/http/api/indirected_routes_spec.rb -@@ -142,15 +142,6 @@ - handler.uri2indirection("GET", uri_escaped, params) - end - -- it "should not pass through an environment to check_authorization and fail if the environment is unknown" do -- expect(handler).to receive(:check_authorization) do |_, _, arg| -- expect(arg).not_to include(:environment) -- end -- 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)))) - 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 deleted file mode 100644 index 6b7b5b48479..00000000000 --- a/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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)))) -
