From 4c0d558d89fdb1be842f5cdfe98c779116ca0ba4 Mon Sep 17 00:00:00 2001 From: Michael Mair-Keimberger Date: Mon, 23 Dec 2019 07:48:31 +0100 Subject: [PATCH] app-admin/puppet: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/14100 Signed-off-by: Michael Mair-Keimberger Signed-off-by: David Seifert --- .../puppet/files/puppet-fix-tests-5.5.14.patch | 18 ------------------ .../puppet/files/puppet-fix-tests-6.4.1.patch | 18 ------------------ 2 files changed, 36 deletions(-) delete mode 100644 app-admin/puppet/files/puppet-fix-tests-5.5.14.patch delete mode 100644 app-admin/puppet/files/puppet-fix-tests-6.4.1.patch 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 09ffe07da1ae..000000000000 --- 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 6b7b5b484792..000000000000 --- 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)))) - -- 2.26.2