puppet 5.4.0-x64-mingw32 → 5.5.0-x64-mingw32

data/spec/unit/functions/versioncmp_spec.rb

@@ -31,6 +31,6 @@ describe "the versioncmp function" do
   it "should call Puppet::Util::Package.versioncmp (included in scope)" do
     Puppet::Util::Package.expects(:versioncmp).with('1.2', '1.3').returns(-1)
 
-    expect(versioncmp('1.2', '1.3')).to eq -1
+    expect(versioncmp('1.2', '1.3')).to eq(-1)
   end
 end

data/spec/unit/functions4_spec.rb

@@ -96,7 +96,6 @@ describe 'the 4x function api' do
     # TODO: Bogus parameters, not yet used
     func = f.new(:closure_scope, :loader)
     expect(func.is_a?(Puppet::Functions::Function)).to be_truthy
-    signature = 'Any x, Any y'
     expect do
       func.call({}, 10)
     end.to raise_error(ArgumentError, "'min' expects 2 arguments, got 1")
@@ -107,7 +106,6 @@ describe 'the 4x function api' do
     # TODO: Bogus parameters, not yet used
     func = f.new(:closure_scope, :loader)
     expect(func.is_a?(Puppet::Functions::Function)).to be_truthy
-    signature = 'Any x, Any y'
     expect do
       func.call({}, 10, 10, 10)
     end.to raise_error(ArgumentError, "'min' expects 2 arguments, got 3")
@@ -122,7 +120,7 @@ describe 'the 4x function api' do
 
   it 'an error is raised if simple function-name and method are not matched' do
     expect do
-      f = create_badly_named_method_function_class()
+      create_badly_named_method_function_class()
     end.to raise_error(ArgumentError, /Function Creation Error, cannot create a default dispatcher for function 'mix', no method with this name found/)
   end
 
@@ -477,7 +475,7 @@ describe 'the 4x function api' do
         the_loader = loader()
         here = get_binding(the_loader)
         expect do
-          fc = eval(<<-CODE, here)
+          eval(<<-CODE, here)
             Puppet::Functions.create_function('testing::test') do
               local_types do
                 type 'MyType += Array[Integer]'
@@ -498,7 +496,7 @@ describe 'the 4x function api' do
         the_loader = loader()
         here = get_binding(the_loader)
         expect do
-          fc = eval(<<-CODE, here)
+          eval(<<-CODE, here)
             Puppet::Functions.create_function('testing::test') do
               dispatch :test do
                 param 'Array[1+=1]', :x
@@ -647,7 +645,7 @@ describe 'the 4x function api' do
 
 
   def create_noargs_function_class
-    f = Puppet::Functions.create_function('test') do
+    Puppet::Functions.create_function('test') do
       def test()
         10
       end
@@ -655,7 +653,7 @@ describe 'the 4x function api' do
   end
 
   def create_min_function_class
-    f = Puppet::Functions.create_function('min') do
+    Puppet::Functions.create_function('min') do
       def min(x,y)
         x <= y ? x : y
       end
@@ -663,7 +661,7 @@ describe 'the 4x function api' do
   end
 
   def create_max_function_class
-    f = Puppet::Functions.create_function('max') do
+    Puppet::Functions.create_function('max') do
       def max(x,y)
         x >= y ? x : y
       end
@@ -671,7 +669,7 @@ describe 'the 4x function api' do
   end
 
   def create_badly_named_method_function_class
-    f = Puppet::Functions.create_function('mix') do
+    Puppet::Functions.create_function('mix') do
       def mix_up(x,y)
         x <= y ? x : y
       end
@@ -679,7 +677,7 @@ describe 'the 4x function api' do
   end
 
   def create_min_function_class_using_dispatch
-    f = Puppet::Functions.create_function('min') do
+    Puppet::Functions.create_function('min') do
         dispatch :min do
           param 'Numeric', :a
           param 'Numeric', :b
@@ -691,7 +689,7 @@ describe 'the 4x function api' do
   end
 
   def create_min_function_class_disptaching_to_two_methods
-    f = Puppet::Functions.create_function('min') do
+    Puppet::Functions.create_function('min') do
       dispatch :min do
         param 'Numeric', :a
         param 'Numeric', :b
@@ -714,7 +712,7 @@ describe 'the 4x function api' do
   end
 
   def create_function_with_optionals_and_repeated
-    f = Puppet::Functions.create_function('min') do
+    Puppet::Functions.create_function('min') do
       def min(x,y,a=1, b=1, *c)
         x <= y ? x : y
       end
@@ -722,7 +720,7 @@ describe 'the 4x function api' do
   end
 
   def create_function_with_optionals_and_repeated_via_dispatch
-    f = Puppet::Functions.create_function('min') do
+    Puppet::Functions.create_function('min') do
       dispatch :min do
         param 'Numeric', :x
         param 'Numeric', :y
@@ -737,7 +735,7 @@ describe 'the 4x function api' do
   end
 
   def create_function_with_optionals_and_repeated_via_multiple_dispatch
-    f = Puppet::Functions.create_function('min') do
+    Puppet::Functions.create_function('min') do
       dispatch :min do
         param 'Numeric', :x
         param 'Numeric', :y
@@ -757,7 +755,7 @@ describe 'the 4x function api' do
   end
 
   def create_function_with_required_repeated_via_dispatch
-    f = Puppet::Functions.create_function('min') do
+    Puppet::Functions.create_function('min') do
       dispatch :min do
         param 'Numeric', :x
         param 'Numeric', :y
@@ -770,7 +768,7 @@ describe 'the 4x function api' do
   end
 
   def create_function_with_repeated
-    f = Puppet::Functions.create_function('count_args') do
+    Puppet::Functions.create_function('count_args') do
       dispatch :count_args do
         repeated_param 'Any', :c
       end
@@ -781,7 +779,7 @@ describe 'the 4x function api' do
   end
 
   def create_function_with_optional_repeated
-    f = Puppet::Functions.create_function('count_args') do
+    Puppet::Functions.create_function('count_args') do
       dispatch :count_args do
         optional_repeated_param 'Any', :c
       end
@@ -792,7 +790,7 @@ describe 'the 4x function api' do
   end
 
   def create_function_with_required_repeated
-    f = Puppet::Functions.create_function('count_args') do
+    Puppet::Functions.create_function('count_args') do
       dispatch :count_args do
         required_repeated_param 'Any', :c
       end
@@ -803,7 +801,7 @@ describe 'the 4x function api' do
   end
 
   def create_function_with_inexact_dispatch
-    f = Puppet::Functions.create_function('t1') do
+    Puppet::Functions.create_function('t1') do
       dispatch :t1 do
         param 'Numeric', :x
         param 'Numeric', :y
@@ -821,7 +819,7 @@ describe 'the 4x function api' do
   end
 
   def create_function_with_rq_after_opt
-    f = Puppet::Functions.create_function('t1') do
+    Puppet::Functions.create_function('t1') do
       dispatch :t1 do
         optional_param 'Numeric', :x
         param 'Numeric', :y
@@ -833,7 +831,7 @@ describe 'the 4x function api' do
   end
 
   def create_function_with_rq_repeated_after_opt
-    f = Puppet::Functions.create_function('t1') do
+    Puppet::Functions.create_function('t1') do
       dispatch :t1 do
         optional_param 'Numeric', :x
         required_repeated_param 'Numeric', :y
@@ -845,7 +843,7 @@ describe 'the 4x function api' do
   end
 
   def create_function_with_param_after_repeated
-    f = Puppet::Functions.create_function('t1') do
+    Puppet::Functions.create_function('t1') do
       dispatch :t1 do
         repeated_param 'Numeric', :x
         param 'Numeric', :y
@@ -857,7 +855,7 @@ describe 'the 4x function api' do
   end
 
   def create_function_with_param_injection_regular
-    f = Puppet::Functions.create_function('test', Puppet::Functions::InternalFunction) do
+    Puppet::Functions.create_function('test', Puppet::Functions::InternalFunction) do
       attr_injected Puppet::Pops::Types::TypeFactory.type_of(FunctionAPISpecModule::TestDuck), :test_attr
       attr_injected Puppet::Pops::Types::TypeFactory.string(), :test_attr2, "a_string"
       attr_injected_producer Puppet::Pops::Types::TypeFactory.integer(), :serial, "an_int"
@@ -877,7 +875,7 @@ describe 'the 4x function api' do
   end
 
   def create_function_with_required_block_all_defaults
-    f = Puppet::Functions.create_function('test') do
+    Puppet::Functions.create_function('test') do
       dispatch :test do
         param 'Integer', :x
         # use defaults, any callable, name is 'block'
@@ -890,7 +888,7 @@ describe 'the 4x function api' do
   end
 
   def create_function_with_scope_required_block_all_defaults
-    f = Puppet::Functions.create_function('test', Puppet::Functions::InternalFunction) do
+    Puppet::Functions.create_function('test', Puppet::Functions::InternalFunction) do
       dispatch :test do
         scope_param
         param 'Integer', :x
@@ -904,7 +902,7 @@ describe 'the 4x function api' do
   end
 
   def create_function_with_required_block_default_type
-    f = Puppet::Functions.create_function('test') do
+    Puppet::Functions.create_function('test') do
       dispatch :test do
         param 'Integer', :x
         # use defaults, any callable, name is 'block'
@@ -917,7 +915,7 @@ describe 'the 4x function api' do
   end
 
   def create_function_with_scope_param_required_repeat
-    f = Puppet::Functions.create_function('test', Puppet::Functions::InternalFunction) do
+    Puppet::Functions.create_function('test', Puppet::Functions::InternalFunction) do
       dispatch :test do
         scope_param
         param 'Any', :extra
@@ -930,7 +928,7 @@ describe 'the 4x function api' do
   end
 
   def create_function_with_required_block_given_type
-    f = Puppet::Functions.create_function('test') do
+    Puppet::Functions.create_function('test') do
       dispatch :test do
         param 'Integer', :x
         required_block_param
@@ -942,7 +940,7 @@ describe 'the 4x function api' do
   end
 
   def create_function_with_required_block_fully_specified
-    f = Puppet::Functions.create_function('test') do
+    Puppet::Functions.create_function('test') do
       dispatch :test do
         param 'Integer', :x
         # use defaults, any callable, name is 'block'
@@ -955,7 +953,7 @@ describe 'the 4x function api' do
   end
 
   def create_function_with_optional_block_all_defaults
-    f = Puppet::Functions.create_function('test') do
+    Puppet::Functions.create_function('test') do
       dispatch :test do
         param 'Integer', :x
         # use defaults, any callable, name is 'block'
@@ -968,7 +966,7 @@ describe 'the 4x function api' do
   end
 
   def create_function_with_no_parameter_dispatch
-    f = Puppet::Functions.create_function('test') do
+    Puppet::Functions.create_function('test') do
       dispatch :test_no_args do
       end
       dispatch :test_one_arg do
@@ -984,7 +982,7 @@ describe 'the 4x function api' do
   end
 
   def create_function_with_mismatch_handler
-    f = Puppet::Functions.create_function('test') do
+    Puppet::Functions.create_function('test') do
       dispatch :test do
         param 'Integer', :x
       end

data/spec/unit/graph/title_hash_prioritizer_spec.rb

@@ -38,8 +38,9 @@ describe Puppet::Graph::TitleHashPrioritizer do
     resource = resource(:notify, "title")
     different_resource = resource(:notify, "title")
 
-    generated = prioritizer.generate_priority_for(resource)
+    prioritizer.generate_priority_for(resource)
 
+    expect(prioritizer.priority_of(resource)).not_to be_nil
     expect(prioritizer.priority_of(different_resource)).to be_nil
   end
 

data/spec/unit/indirector/catalog/compiler_spec.rb

@@ -89,7 +89,6 @@ describe Puppet::Resource::Catalog::Compiler do
 
     it "should pass the found node to the compiler for compiling" do
       Puppet::Node.indirection.expects(:find).with(node_name, anything).returns(node)
-      config = mock 'config'
       Puppet::Parser::Compiler.expects(:compile).with(node, anything)
       compiler.find(@request)
     end
@@ -287,10 +286,6 @@ describe Puppet::Resource::Catalog::Compiler do
       it "accepts PSON facts from older agents" do
         request = a_legacy_request_that_contains(@facts)
 
-        options = {
-          :environment => request.environment,
-          :transaction_uuid => request.options[:transaction_uuid],
-        }
         facts = compiler.extract_facts_from_request(request)
         expect(facts).to eq(@facts)
       end
@@ -298,11 +293,6 @@ describe Puppet::Resource::Catalog::Compiler do
       it "rejects YAML facts" do
         request = a_legacy_request_that_contains(@facts, :yaml)
 
-        options = {
-          :environment => request.environment,
-          :transaction_uuid => request.options[:transaction_uuid],
-        }
-
         expect {
           compiler.extract_facts_from_request(request)
         }.to raise_error(ArgumentError, /Unsupported facts format/)
@@ -312,11 +302,6 @@ describe Puppet::Resource::Catalog::Compiler do
         request = a_request_that_contains(@facts)
         request.options[:facts_format] = 'unknown-format'
 
-        options = {
-          :environment => request.environment,
-          :transaction_uuid => request.options[:transaction_uuid],
-        }
-
         expect {
           compiler.extract_facts_from_request(request)
         }.to raise_error(ArgumentError, /Unsupported facts format/)

data/spec/unit/indirector/facts/rest_spec.rb

@@ -0,0 +1,45 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+
+require 'puppet/indirector/facts/rest'
+
+describe Puppet::Node::Facts::Rest do
+  it "should be a sublcass of Puppet::Indirector::REST" do
+    expect(Puppet::Node::Facts::Rest.superclass).to equal(Puppet::Indirector::REST)
+  end
+
+  let(:model) { Puppet::Node::Facts }
+  before(:each) { model.indirection.terminus_class = :rest }
+
+  def mock_response(code, body, content_type='text/plain', encoding=nil)
+    obj = stub('http response', :code => code.to_s, :body => body)
+    obj.stubs(:[]).with('content-type').returns(content_type)
+    obj.stubs(:[]).with('content-encoding').returns(encoding)
+    obj.stubs(:[]).with(Puppet::Network::HTTP::HEADER_PUPPET_VERSION).returns(Puppet.version)
+    obj
+  end
+
+  describe '#save' do
+    subject { model.indirection.terminus(:rest) }
+
+    let(:connection) { stub('mock http connection', :verify_callback= => nil) }
+    let(:node_name) { 'puppet.node.test' }
+    let(:data) { model.new(node_name, {test_fact: 'test value'}) }
+    let(:request) { Puppet::Indirector::Request.new(:facts, :save, node_name, data) }
+
+    before :each do
+      subject.stubs(:network).returns(connection)
+    end
+
+    context 'when a 404 response is received' do
+      let(:response) { mock_response(404, '{}', 'test/json') }
+
+      before(:each) { connection.expects(:put).returns response }
+
+      it 'riases with HTTP 404' do
+        expect{ subject.save(request) }.to raise_error(Net::HTTPError,
+                                                       /Error 404 on SERVER/)
+      end
+    end
+  end
+end

data/spec/unit/indirector/facts/yaml_spec.rb

@@ -23,6 +23,12 @@ describe Puppet::Node::Facts::Yaml do
     expect(Puppet::Node::Facts::Yaml.name).to eq(:yaml)
   end
 
+  it "should allow network requests" do
+    # Doesn't allow yaml as a network format, but allows `puppet facts upload`
+    # to update the YAML cache on a master.
+    expect(Puppet::Node::Facts::Yaml.new.allow_remote_requests?).to be(true)
+  end
+
   describe "#search" do
     def assert_search_matches(matching, nonmatching, query)
       request = Puppet::Indirector::Request.new(:inventory, :search, nil, nil, query)

data/spec/unit/indirector/file_bucket_file/file_spec.rb

@@ -96,7 +96,7 @@ describe Puppet::FileBucketFile::File, :uses_checksums => true do
               if Puppet::Util::Platform.windows? && (['sha512', 'sha384'].include? digest_algorithm)
                 skip "PUP-8257: Skip file bucket test on windows for #{digest_algorithm} due to long path names"
               else
-                checksum = save_bucket_file(plaintext, "/foo/bar")
+                save_bucket_file(plaintext, "/foo/bar")
   
                 dir_path = "#{Puppet[:bucketdir]}/#{bucket_dir}"
                 contents_file = "#{dir_path}/contents"
@@ -139,7 +139,7 @@ describe Puppet::FileBucketFile::File, :uses_checksums => true do
             if Puppet::Util::Platform.windows? && (['sha512', 'sha384'].include? digest_algorithm)
               skip "PUP-8257: Skip file bucket test on windows for #{digest_algorithm} due to long path names"
             else
-              checksum = save_bucket_file(plaintext, "")
+              save_bucket_file(plaintext, "")
   
               dir_path = "#{Puppet[:bucketdir]}/#{bucket_dir}"
               expect(Puppet::FileSystem.binread("#{dir_path}/contents")).to eq(plaintext)

data/spec/unit/indirector/indirection_spec.rb

@@ -788,7 +788,7 @@ describe Puppet::Indirector::Indirection do
 
     it "should not create a terminus instance until one is actually needed" do
       Puppet::Indirector.expects(:terminus).never
-      indirection = Puppet::Indirector::Indirection.new(mock('model'), :lazytest)
+      Puppet::Indirector::Indirection.new(mock('model'), :lazytest)
     end
 
     after do

data/spec/unit/indirector/node/ldap_spec.rb

@@ -46,11 +46,11 @@ describe Puppet::Node::Ldap do
       end
 
       it "should add the entry's common name to the hash if fqdn if false" do
-        expect(node_indirection.entry2hash(@entry,fqdn = false)[:name]).to eq("mynode")
+        expect(node_indirection.entry2hash(@entry, false)[:name]).to eq("mynode")
       end
 
       it "should add the entry's fqdn name to the hash if fqdn if true" do
-        expect(node_indirection.entry2hash(@entry,fqdn = true)[:name]).to eq("mynode.madstop.com")
+        expect(node_indirection.entry2hash(@entry, true)[:name]).to eq("mynode.madstop.com")
       end
 
       it "should add all of the entry's classes to the hash" do

data/spec/unit/indirector/request_spec.rb

@@ -260,8 +260,6 @@ describe Puppet::Indirector::Request do
   end
 
   it "should use the current environment when none is provided" do
-    configured = Puppet::Node::Environment.create(:foo, [])
-
     Puppet[:environment] = "foo"
 
     expect(Puppet::Indirector::Request.new(:myind, :find, "my key", nil).environment).to eq(Puppet.lookup(:current_environment))

data/spec/unit/indirector/rest_spec.rb

@@ -1,6 +1,6 @@
 #! /usr/bin/env ruby
 require 'spec_helper'
-require 'json'
+require 'puppet/util/json'
 require 'puppet/indirector'
 require 'puppet/indirector/errors'
 require 'puppet/indirector/rest'
@@ -52,7 +52,7 @@ shared_examples_for "a REST terminus method" do |terminus_method|
     describe "when the response code is #{code}" do
       let(:message) { 'error messaged!!!' }
       let(:body) do
-        JSON.generate({
+        Puppet::Util::Json.dump({
           :issue_kind => 'server-error',
           :message    => message
         })