| 1 |
commit: 67dd528c748f33ec564fc50b409361de6bbe4a1c |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 28 14:09:32 2016 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 28 14:10:00 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67dd528c |
| 7 |
|
| 8 |
app-admin/puppet: fix patch for bug 581428 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
app-admin/puppet/files/puppet-fix-tests-4.4.2.patch | 18 ++++++++++++++++++ |
| 13 |
app-admin/puppet/puppet-4.4.2.ebuild | 2 +- |
| 14 |
2 files changed, 19 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/app-admin/puppet/files/puppet-fix-tests-4.4.2.patch b/app-admin/puppet/files/puppet-fix-tests-4.4.2.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..b77c1ce |
| 19 |
--- /dev/null |
| 20 |
+++ b/app-admin/puppet/files/puppet-fix-tests-4.4.2.patch |
| 21 |
@@ -0,0 +1,18 @@ |
| 22 |
+--- spec/unit/network/http/api/indirected_routes_spec.rb 2016-04-22 17:15:56.000000000 -0500 |
| 23 |
++++ spec/unit/network/http/api/indirected_routes_spec.rb.new 2016-04-28 09:06:38.133311369 -0500 |
| 24 |
+@@ -140,15 +140,6 @@ |
| 25 |
+ indirection, _, _, _ = handler.uri2indirection("GET", uri_escaped, params) |
| 26 |
+ end |
| 27 |
+ |
| 28 |
+- it "should not pass through an environment to check_authorization and fail if the environment is unknown" do |
| 29 |
+- handler.expects(:check_authorization).with(anything, |
| 30 |
+- anything, |
| 31 |
+- Not(has_entry(:environment))) |
| 32 |
+- expect(lambda { handler.uri2indirection("GET", |
| 33 |
+- "#{master_url_prefix}/node/bar", |
| 34 |
+- {:environment => 'bogus'}) }).to raise_error(ArgumentError) |
| 35 |
+- end |
| 36 |
+- |
| 37 |
+ it "should not URI unescape the indirection key as passed through to a call to check_authorization" do |
| 38 |
+ handler.expects(:check_authorization).with(anything, |
| 39 |
+ anything, |
| 40 |
|
| 41 |
diff --git a/app-admin/puppet/puppet-4.4.2.ebuild b/app-admin/puppet/puppet-4.4.2.ebuild |
| 42 |
index dc356cf..67270df 100644 |
| 43 |
--- a/app-admin/puppet/puppet-4.4.2.ebuild |
| 44 |
+++ b/app-admin/puppet/puppet-4.4.2.ebuild |
| 45 |
@@ -66,7 +66,7 @@ all_ruby_prepare() { |
| 46 |
rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die |
| 47 |
|
| 48 |
# can't be run within portage. |
| 49 |
- epatch "${FILESDIR}/puppet-fix-tests-4.x.patch" |
| 50 |
+ epatch "${FILESDIR}/puppet-fix-tests-4.4.2.patch" |
| 51 |
|
| 52 |
# Avoid specs that can only run in the puppet.git repository. This |
| 53 |
# should be narrowed down to the specific specs. |
Archives