commit: 67dd528c748f33ec564fc50b409361de6bbe4a1c
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 14:09:32 2016 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 14:10:00 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67dd528c
app-admin/puppet: fix patch for bug 581428
Package-Manager: portage-2.2.26
app-admin/puppet/files/puppet-fix-tests-4.4.2.patch | 18 ++++++++++++++++++
app-admin/puppet/puppet-4.4.2.ebuild | 2 +-
2 files changed, 19 insertions(+), 1 deletion(-)
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
new file mode 100644
index 0000000..b77c1ce
--- /dev/null
+++ b/app-admin/puppet/files/puppet-fix-tests-4.4.2.patch
@@ -0,0 +1,18 @@
+--- spec/unit/network/http/api/indirected_routes_spec.rb 2016-04-22
17:15:56.000000000 -0500
++++ spec/unit/network/http/api/indirected_routes_spec.rb.new 2016-04-28
09:06:38.133311369 -0500
+@@ -140,15 +140,6 @@
+ indirection, _, _, _ = 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
+- handler.expects(:check_authorization).with(anything,
+- anything,
+- Not(has_entry(:environment)))
+- expect(lambda { handler.uri2indirection("GET",
+- "#{master_url_prefix}/node/bar",
+- {:environment => 'bogus'})
}).to raise_error(ArgumentError)
+- end
+-
+ it "should not URI unescape the indirection key as passed through to a
call to check_authorization" do
+ handler.expects(:check_authorization).with(anything,
+ anything,
diff --git a/app-admin/puppet/puppet-4.4.2.ebuild
b/app-admin/puppet/puppet-4.4.2.ebuild
index dc356cf..67270df 100644
--- a/app-admin/puppet/puppet-4.4.2.ebuild
+++ b/app-admin/puppet/puppet-4.4.2.ebuild
@@ -66,7 +66,7 @@ all_ruby_prepare() {
rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
# can't be run within portage.
- epatch "${FILESDIR}/puppet-fix-tests-4.x.patch"
+ epatch "${FILESDIR}/puppet-fix-tests-4.4.2.patch"
# Avoid specs that can only run in the puppet.git repository. This
# should be narrowed down to the specific specs.
