diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
commit | 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch) | |
tree | e1810a4b135afce04b34862ef0fab2bfaeb8aeca /app-admin/puppet/files | |
parent | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff) |
gentoo resync : 15.01.2020
Diffstat (limited to 'app-admin/puppet/files')
-rw-r--r-- | app-admin/puppet/files/50puppet-mode-gentoo.el | 6 | ||||
-rw-r--r-- | app-admin/puppet/files/puppet-fix-tests-5.5.14.patch | 18 | ||||
-rw-r--r-- | app-admin/puppet/files/puppet-fix-tests-6.4.1.patch | 18 |
3 files changed, 0 insertions, 42 deletions
diff --git a/app-admin/puppet/files/50puppet-mode-gentoo.el b/app-admin/puppet/files/50puppet-mode-gentoo.el deleted file mode 100644 index 64c38ae5a31d..000000000000 --- a/app-admin/puppet/files/50puppet-mode-gentoo.el +++ /dev/null @@ -1,6 +0,0 @@ - -;;; puppet-mode site-lisp configuration - -(add-to-list 'load-path "@SITELISP@") -(autoload 'puppet-mode "puppet-mode" "Major mode for editing puppet manifests") -(add-to-list 'auto-mode-alist '("\\.pp$" . puppet-mode)) 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)))) - |