| 1 |
commit: 4c0d558d89fdb1be842f5cdfe98c779116ca0ba4 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Dec 23 06:48:31 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 23 10:15:23 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c0d558d |
| 7 |
|
| 8 |
app-admin/puppet: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/14100 |
| 11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
app-admin/puppet/files/puppet-fix-tests-5.5.14.patch | 18 ------------------ |
| 15 |
app-admin/puppet/files/puppet-fix-tests-6.4.1.patch | 18 ------------------ |
| 16 |
2 files changed, 36 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
deleted file mode 100644 |
| 20 |
index 09ffe07da1a..00000000000 |
| 21 |
--- a/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,18 +0,0 @@ |
| 24 |
---- puppet/spec/unit/network/http/api/indirected_routes_spec.rb |
| 25 |
-+++ puppet/spec/unit/network/http/api/indirected_routes_spec.rb |
| 26 |
-@@ -142,15 +142,6 @@ |
| 27 |
- handler.uri2indirection("GET", uri_escaped, params) |
| 28 |
- end |
| 29 |
- |
| 30 |
-- it "should not pass through an environment to check_authorization and fail if the environment is unknown" do |
| 31 |
-- expect(handler).to receive(:check_authorization) do |_, _, arg| |
| 32 |
-- expect(arg).not_to include(:environment) |
| 33 |
-- end |
| 34 |
-- expect(lambda { handler.uri2indirection("GET", |
| 35 |
-- "#{master_url_prefix}/node/bar", |
| 36 |
-- {:environment => 'bogus'}) }).to raise_error(not_found_error) |
| 37 |
-- end |
| 38 |
-- |
| 39 |
- it "should not URI unescape the indirection key as passed through to a call to check_authorization" do |
| 40 |
- expect(handler).to receive(:check_authorization).with(anything, anything, hash_including(environment: be_a(Puppet::Node::Environment).and(have_attributes(name: :env)))) |
| 41 |
- |
| 42 |
|
| 43 |
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 |
| 44 |
deleted file mode 100644 |
| 45 |
index 6b7b5b48479..00000000000 |
| 46 |
--- a/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch |
| 47 |
+++ /dev/null |
| 48 |
@@ -1,18 +0,0 @@ |
| 49 |
---- spec/unit/network/http/api/indirected_routes_spec.rb 2018-09-17 19:36:56.000000000 -0500 |
| 50 |
-+++ spec/unit/network/http/api/indirected_routes_spec.rb 2018-09-19 10:52:35.841614932 -0500 |
| 51 |
-@@ -144,15 +144,6 @@ |
| 52 |
- handler.uri2indirection("GET", uri_escaped, params) |
| 53 |
- end |
| 54 |
- |
| 55 |
-- it "when the environment is unknown should remove :environment from params passed to check_authorization and therefore fail" do |
| 56 |
-- expect(handler).to receive(:check_authorization).with(anything, |
| 57 |
-- anything, |
| 58 |
-- excluding(:environment)) |
| 59 |
-- expect(lambda { handler.uri2indirection("GET", |
| 60 |
-- "#{master_url_prefix}/node/bar", |
| 61 |
-- {:environment => 'bogus'}) }).to raise_error(not_found_error) |
| 62 |
-- end |
| 63 |
-- |
| 64 |
- it "should not URI unescape the indirection key as passed through to a call to check_authorization" do |
| 65 |
- expect(handler).to receive(:check_authorization).with(anything, anything, hash_including(environment: be_a(Puppet::Node::Environment).and(have_attributes(name: :env)))) |
| 66 |
- |
Archives