app-admin/puppet: remove unused patches
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>
Mon, 23 Dec 2019 06:48:31 +0000 (07:48 +0100)
committerDavid Seifert <soap@gentoo.org>
Mon, 23 Dec 2019 10:15:23 +0000 (11:15 +0100)
Closes: https://github.com/gentoo/gentoo/pull/14100
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Signed-off-by: David Seifert <soap@gentoo.org>
app-admin/puppet/files/puppet-fix-tests-5.5.14.patch [deleted file]
app-admin/puppet/files/puppet-fix-tests-6.4.1.patch [deleted file]

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 (file)
index 09ffe07..0000000
+++ /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 (file)
index 6b7b5b4..0000000
+++ /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))))