puppet 7.24.0-x86-mingw32 → 8.0.1-x86-mingw32

data/spec/unit/functions/lookup_spec.rb

@@ -3,7 +3,6 @@ require 'puppet_spec/compiler'
 require 'puppet_spec/files'
 require 'puppet/pops'
 require 'deep_merge/core'
-require 'hiera'
 
 describe "The lookup function" do
   include PuppetSpec::Compiler
@@ -287,7 +286,6 @@ describe "The lookup function" do
             YAML
 
           it 'fails and reports error' do
-            Puppet[:strict] = :error
             expect { lookup('a') }.to raise_error(
               "'default_hierarchy' is only allowed in the module layer (file: #{code_dir}/hiera.yaml, line: 5)")
           end
@@ -303,8 +301,7 @@ describe "The lookup function" do
             YAML
 
           it 'fails and reports errors when strict == error' do
-            Puppet[:strict] = :error
-            expect { lookup('a') }.to raise_error("Undefined variable '::nonesuch' (file: #{code_dir}/hiera.yaml, line: 4)")
+            expect { lookup('a') }.to raise_error("Function lookup() did not find a value for the name 'a'")
           end
         end
 
@@ -317,7 +314,6 @@ describe "The lookup function" do
             YAML
 
           it 'fails and reports errors when strict == error' do
-            Puppet[:strict] = :error
             expect { lookup('a') }.to raise_error("Interpolation using method syntax is not allowed in this context (file: #{code_dir}/hiera.yaml)")
           end
         end
@@ -574,9 +570,11 @@ describe "The lookup function" do
         it 'reloads the configuration if interpolated values change' do
           Puppet[:log_level] = 'debug'
           collect_notices("notice('success')") do |scope|
+            scope['var'] = {}
             expect(lookup_func.call(scope, 'y')).to eql('value y from x')
-            scope['var'] = { 'sub' => '_d' }
-            expect(lookup_func.call(scope, 'y')).to eql('value y from x_d')
+            nested_scope = scope.compiler.newscope(scope)
+            nested_scope['var'] = { 'sub' => '_d' }
+            expect(lookup_func.call(nested_scope, 'y')).to eql('value y from x_d')
             nested_scope = scope.compiler.newscope(scope)
             nested_scope['var'] = { 'sub' => '_e' }
             expect(lookup_func.call(nested_scope, 'y')).to eql('value y from x_e')
@@ -603,15 +601,10 @@ describe "The lookup function" do
       context 'using global variable reference' do
         let(:data_path) { 'x%{::var.sub}.yaml' }
 
-        it 'reloads the configuration if interpolated that was previously undefined, gets defined' do
-          Puppet[:log_level] = 'debug'
+        it 'does not raise an error when reloads the configuration if interpolating undefined values' do
           collect_notices("notice('success')") do |scope|
-            expect(lookup_func.call(scope, 'y')).to eql('value y from x')
-            scope['var'] = { 'sub' => '_d' }
-            expect(lookup_func.call(scope, 'y')).to eql('value y from x_d')
+            expect { lookup_func.call(scope, 'y') }.to_not raise_error
           end
-          expect(notices).to eql(['success'])
-          expect(debugs.any? { |m| m =~ /Hiera configuration recreated due to change of scope variables used in interpolation expressions/ }).to be_truthy
         end
 
         it 'does not reload the configuration if value changes locally' do
@@ -727,10 +720,13 @@ describe "The lookup function" do
         it 'interpolates both key and value"' do
           Puppet[:log_level] = 'debug'
           collect_notices("notice('success')") do |scope|
+            scope['key'] = ''
+            scope['value'] = ''
             expect(lookup_func.call(scope, 'a')).to eql({'' => 'the '})
-            scope['key'] = 'a_key'
-            scope['value'] = 'interpolated value'
-            expect(lookup_func.call(scope, 'a')).to eql({'a_key' => 'the interpolated value'})
+            nested_scope = scope.compiler.newscope(scope)
+            nested_scope['key'] = 'a_key'
+            nested_scope['value'] = 'interpolated value'
+            expect(lookup_func.call(nested_scope, 'a')).to eql({'a_key' => 'the interpolated value'})
           end
           expect(notices).to eql(['success'])
         end
@@ -784,15 +780,26 @@ describe "The lookup function" do
       context 'that contains a legal yaml that is not a hash' do
         let(:common_yaml) { "- A list\n- of things" }
 
-        it 'fails with a "did not find"' do
+        it 'fails with a "invalid yaml hash"' do
           expect { lookup('a') }.to raise_error do |e|
-            expect(e.message).to match(/did not find a value for the name 'a'/)
+            expect(e.message).to match(/spec\/data\/common.yaml: file does not contain a valid yaml hash/)
           end
         end
 
-        it 'logs a warning that the file does not contain a hash' do
-          expect { lookup('a') }.to raise_error(Puppet::DataBinding::LookupError)
-          expect(warnings).to include(/spec\/data\/common.yaml: file does not contain a valid yaml hash/)
+        context 'when strict mode is off' do
+          before :each do
+            Puppet[:strict] = :warning
+          end
+          it 'fails with a "did not find"' do
+            expect { lookup('a') }.to raise_error do |e|
+              expect(e.message).to match(/did not find a value for the name 'a'/)
+            end
+          end
+
+          it 'logs a warning that the file does not contain a hash' do
+            expect { lookup('a') }.to raise_error(Puppet::DataBinding::LookupError)
+            expect(warnings).to include(/spec\/data\/common.yaml: file does not contain a valid yaml hash/)
+          end
         end
       end
 
@@ -1652,7 +1659,7 @@ describe "The lookup function" do
         end
       end
 
-      context 'version 3' do
+      context 'version 3', :if => Puppet.features.hiera? do
         it 'finds data in in global layer and reports deprecation warnings for hiera.yaml' do
           expect(lookup('a')).to eql('value a (from global)')
           expect(warnings).to include(/Use of 'hiera.yaml' version 3 is deprecated. It should be converted to version 5/)
@@ -1697,6 +1704,14 @@ describe "The lookup function" do
           expect(lookup('datasources')).to eql(['common', 'example.com'])
         end
 
+        it 'backend specific options are propagated to custom backend' do
+          expect(lookup('other_option')).to eql('value of other_option')
+        end
+
+        it 'dotted keys are passed down to custom backend' do
+          expect(lookup('dotted.key')).to eql('custom backend received request for dotted.key value')
+        end
+        
         it 'delegates configured hocon backend to hocon_data function' do
           expect(explain('xs')).to match(/Hierarchy entry "hocon"\n.*\n.*\n.*"common"\n\s*Found key: "xs"/m)
         end
@@ -1705,6 +1720,18 @@ describe "The lookup function" do
           expect(lookup('xs.subkey')).to eql('value xs.subkey (from global hocon)')
         end
 
+        it 'multiple hiera3_backend declarations can be used and are merged into the generated config' do
+          expect(lookup(['datasources', 'other_option'])).to eql([['common', 'example.com'], 'value of other_option'])
+          expect(Hiera::Config.instance_variable_get(:@config)).to eql(
+            {
+              :backends => ['custom', 'other'],
+              :hierarchy => ['common', '%{domain}'],
+              :custom => { :datadir => "#{code_dir}/hieradata" },
+              :other => { :other_option => 'value of other_option', :datadir=>"#{code_dir}/hieradata" },
+              :logger => 'puppet'
+            })
+        end
+
         context 'with a module data provider' do
           let(:module_files) do
             {
@@ -2041,18 +2068,6 @@ describe "The lookup function" do
               paths:
                 - common.conf
                 - "%{domain}.conf"
-            - name: Custom
-              hiera3_backend: custom
-              paths:
-                - common.custom
-                - "%{domain}.custom"
-            - name: Other
-              hiera3_backend: other
-              options:
-                other_option: value of other_option
-              paths:
-                - common.other
-                - "%{domain}.other"
               YAML
         end
 
@@ -2067,7 +2082,6 @@ describe "The lookup function" do
           expect(explanation).to include('Hierarchy entry "Yaml"')
           expect(explanation).to include('Hierarchy entry "Json"')
           expect(explanation).to include('Hierarchy entry "Hocon"')
-          expect(explanation).to include('Hierarchy entry "Custom"')
           expect(explanation).to include('Found key: "a" value: "value a (from global)"')
         end
 
@@ -2079,35 +2093,10 @@ describe "The lookup function" do
                   'caa' => 'value hash_c.hash_ca.caa (from environment)',
                   'cab' => 'value hash_c.hash_ca.cab (from global)',
                   'cac' => 'value hash_c.hash_ca.cac (from global json)',
-                  'cad' => 'value hash_c.hash_ca.cad (from global custom)'
                 }
             })
         end
 
-        it 'backend data sources are propagated to custom backend' do
-          expect(lookup('datasources')).to eql(['common', 'example.com'])
-        end
-
-        it 'backend specific options are propagated to custom backend' do
-          expect(lookup('other_option')).to eql('value of other_option')
-        end
-
-        it 'dotted keys are passed down to custom backend' do
-          expect(lookup('dotted.key')).to eql('custom backend received request for dotted.key value')
-        end
-
-        it 'multiple hiera3_backend declarations can be used and are merged into the generated config' do
-          expect(lookup(['datasources', 'other_option'])).to eql([['common', 'example.com'], 'value of other_option'])
-          expect(Hiera::Config.instance_variable_get(:@config)).to eql(
-            {
-              :backends => ['custom', 'other'],
-              :hierarchy => ['common', '%{domain}'],
-              :custom => { :datadir => "#{code_dir}/hieradata" },
-              :other => { :other_option => 'value of other_option', :datadir=>"#{code_dir}/hieradata" },
-              :logger => 'puppet'
-            })
-        end
-
         it 'provides a sensible error message when the hocon library is not loaded' do
           allow(Puppet.features).to receive(:hocon?).and_return(false)
 
@@ -2156,7 +2145,7 @@ describe "The lookup function" do
             end
           end
 
-          context 'and eyaml_lookup_key function' do
+          context 'and eyaml_lookup_key function', :if => Puppet.features.hiera_eyaml? do
             let(:hiera_yaml) { <<-YAML.unindent }
               version: 5
               hierarchy:
@@ -2171,7 +2160,7 @@ describe "The lookup function" do
         end
       end
 
-      context 'with a hiera3_backend that has no paths' do
+      context 'with a hiera3_backend that has no paths', :if => Puppet.features.hiera? do
         let(:hiera_yaml) do
           <<-YAML.unindent
           ---
@@ -2215,7 +2204,7 @@ describe "The lookup function" do
           expect { lookup('mod_a::b') }.to raise_error(Puppet::DataBinding::LookupError, /did not find a value for the name 'mod_a::b'/)
         end
 
-        context 'with a Hiera v3 configuration' do
+        context 'with a Hiera v3 configuration', :if => Puppet.features.hiera?  do
           let(:mod_a_files) do
             {
               'mod_a' => {
@@ -2468,15 +2457,16 @@ describe "The lookup function" do
           expect(lookup('mod_a::interpolate_scope')).to eql('-- scope scalar value --')
         end
 
-        it 'interpolates not found in scope as empty string' do
-          expect(lookup('mod_a::interpolate_scope_not_found')).to eql('--  --')
+        it 'raises an error when trying to interpolate not found in scope' do
+          expect { lookup('mod_a::interpolate_scope_not_found') 
+          }.to raise_error(/Evaluation Error: Error while evaluating a Function Call, Undefined variable 'scope_nope';/)
         end
 
         it 'interpolates dotted key from scope' do
           expect(lookup('mod_a::interpolate_scope_dig')).to eql('-- scope hash a --')
         end
 
-        it 'treates interpolated dotted key but not found in scope as empty string' do
+        it 'treats interpolated dotted key but not found in scope as empty string' do
           expect(lookup('mod_a::interpolate_scope_dig_not_found')).to eql('--  --')
         end
 
@@ -2992,7 +2982,7 @@ describe "The lookup function" do
       end
     end
 
-    context 'and an eyaml lookup_key function' do
+    context 'and an eyaml lookup_key function', :if => Puppet.features.hiera_eyaml? do
       let(:private_key_name) { 'private_key.pkcs7.pem' }
       let(:public_key_name) { 'public_key.pkcs7.pem' }
 
@@ -3294,7 +3284,7 @@ describe "The lookup function" do
         expect(lookup('array_a')).to eql(['array_a[0]', 'array_a[1]'])
       end
 
-      context 'declared in global scope as a Hiera v3 backend' do
+      context 'declared in global scope as a Hiera v3 backend', :if => Puppet.features.hiera? do
         let(:environment_files) { {} }
         let(:data_file_content) { <<-YAML.unindent }
           a: >

data/spec/unit/functions/max_spec.rb

@@ -67,6 +67,36 @@ describe 'the max function' do
 
   end
 
+  context 'compares semver' do
+    { ["Semver('2.0.0')", "Semver('10.0.0')"] => "Semver('10.0.0')",
+      ["Semver('5.5.5')", "Semver('5.6.7')"]  => "Semver('5.6.7')",
+    }.each_pair do |values, expected|
+      it "called as max(#{values[0]}, #{values[1]}) results in the value #{expected}" do
+        expect(compile_to_catalog("notify { String( max(#{values[0]}, #{values[1]}) == #{expected}): }")).to have_resource("Notify[true]")
+      end
+    end
+  end
+
+  context 'compares timespans' do
+    { ["Timespan(2)", "Timespan(77.3)"] => "Timespan(77.3)",
+      ["Timespan('1-00:00:00')", "Timespan('2-00:00:00')"]  => "Timespan('2-00:00:00')",
+    }.each_pair do |values, expected|
+      it "called as max(#{values[0]}, #{values[1]}) results in the value #{expected}" do
+        expect(compile_to_catalog("notify { String( max(#{values[0]}, #{values[1]}) == #{expected}): }")).to have_resource("Notify[true]")
+      end
+    end
+  end
+
+  context 'compares timestamps' do
+    { ["Timestamp(0)", "Timestamp(298922400)"] => "Timestamp(298922400)",
+      ["Timestamp('1970-01-01T12:00:00.000')", "Timestamp('1979-06-22T18:00:00.000')"]  => "Timestamp('1979-06-22T18:00:00.000')",
+    }.each_pair do |values, expected|
+      it "called as max(#{values[0]}, #{values[1]}) results in the value #{expected}" do
+        expect(compile_to_catalog("notify { String( max(#{values[0]}, #{values[1]}) == #{expected}): }")).to have_resource("Notify[true]")
+      end
+    end
+  end
+
   context 'compares all except numeric and string by conversion to string and issues deprecation warning' do
     {
       [[20], "'a'"]                  => "'a'",            # after since '[' is before 'a'
@@ -74,7 +104,6 @@ describe 'the max function' do
       [false, 'fal']                 => "false",          # the boolean since text 'false' is longer
       ['/b/', "'(?-mix:c)'"]         => "'(?-mix:c)'",    # because regexp to_s is a (?-mix:b) string
       ["Timestamp(1)", "'1980 a.d'"] => "'1980 a.d'",     # because timestamp to_s is a date-time string here starting with 1970
-      ["Semver('2.0.0')", "Semver('10.0.0')"] => "Semver('2.0.0')", # "10.0.0" is lexicographically before "2.0.0"
     }.each_pair do |values, expected|
       it "called as max(#{values[0]}, #{values[1]}) results in the value #{expected} and issues deprecation warning" do
         Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do

data/spec/unit/functions/min_spec.rb

@@ -67,6 +67,36 @@ describe 'the min function' do
 
   end
 
+  context 'compares semver' do
+    { ["Semver('2.0.0')", "Semver('10.0.0')"] => "Semver('2.0.0')",
+      ["Semver('5.5.5')", "Semver('5.6.7')"]  => "Semver('5.5.5')",
+    }.each_pair do |values, expected|
+      it "called as min(#{values[0]}, #{values[1]}) results in the value #{expected}" do
+        expect(compile_to_catalog("notify { String( min(#{values[0]}, #{values[1]}) == #{expected}): }")).to have_resource("Notify[true]")
+      end
+    end
+  end
+
+  context 'compares timespans' do
+    { ["Timespan(2)", "Timespan(77.3)"] => "Timespan(2)",
+      ["Timespan('1-00:00:00')", "Timespan('2-00:00:00')"]  => "Timespan('1-00:00:00')",
+    }.each_pair do |values, expected|
+      it "called as min(#{values[0]}, #{values[1]}) results in the value #{expected}" do
+        expect(compile_to_catalog("notify { String( min(#{values[0]}, #{values[1]}) == #{expected}): }")).to have_resource("Notify[true]")
+      end
+    end
+  end
+
+  context 'compares timestamps' do
+    { ["Timestamp(0)", "Timestamp(298922400)"] => "Timestamp(0)",
+      ["Timestamp('1970-01-01T12:00:00.000')", "Timestamp('1979-06-22T18:00:00.000')"]  => "Timestamp('1970-01-01T12:00:00.000')",
+    }.each_pair do |values, expected|
+      it "called as min(#{values[0]}, #{values[1]}) results in the value #{expected}" do
+        expect(compile_to_catalog("notify { String( min(#{values[0]}, #{values[1]}) == #{expected}): }")).to have_resource("Notify[true]")
+      end
+    end
+  end
+
   context 'compares all except numeric and string by conversion to string (and issues deprecation warning)' do
     {
       [[20], "'a'"]                  => [20],             # before since '[' is before 'a'
@@ -74,7 +104,6 @@ describe 'the min function' do
       [false, 'fal']                 => "'fal'",          # 'fal' before since shorter than 'false'
       ['/b/', "'(?-mix:a)'"]         => "'(?-mix:a)'",    # because regexp to_s is a (?-mix:b) string
       ["Timestamp(1)", "'1556 a.d'"] => "'1556 a.d'",     # because timestamp to_s is a date-time string here starting with 1970
-      ["Semver('2.0.0')", "Semver('10.0.0')"] => "Semver('10.0.0')", # "10.0.0" is lexicographically before "2.0.0"
     }.each_pair do |values, expected|
       it "called as min(#{values[0]}, #{values[1]}) results in the value #{expected} and issues deprecation warning" do
         Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do

data/spec/unit/functions/return_spec.rb

@@ -19,6 +19,10 @@ describe 'the return function' do
     end
 
     it 'with undef value as function result when not given an argument' do
+      # strict mode is off so behavior this test is trying to check isn't stubbed out
+      Puppet[:strict_variables] = false
+      Puppet[:strict] = :warning
+
       expect(compile_to_catalog(<<-CODE)).to have_resource('Notify[xy]')
           function please_return() {
             [1,2,3].map |$x| { if $x == 1 { return() } 200 }

data/spec/unit/hiera/scope_spec.rb

@@ -16,10 +16,15 @@ describe Hiera::Scope do
   end
 
   describe "#[]" do
-    it "should return nil when no value is found" do
+    it "should return nil when no value is found and strict mode is off" do
+      Puppet[:strict] = :warning
       expect(scope["foo"]).to eq(nil)
     end
 
+    it "should raise error by default when no value is found" do
+      expect { scope["foo"] }.to raise_error(/Undefined variable 'foo'/)
+    end
+
     it "should treat '' as nil" do
       real["foo"] = ""
 

data/spec/unit/hiera_puppet_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'hiera_puppet'
 require 'puppet_spec/scope'
 
-describe 'HieraPuppet' do
+describe 'HieraPuppet', :if => Puppet.features.hiera? do
   include PuppetSpec::Scope
 
   after(:all) do

data/spec/unit/http/factory_spec.rb

@@ -140,7 +140,7 @@ describe Puppet::HTTP::Factory do
   end
 
   context 'tls' do
-    it "sets the minimum version to TLS 1.0", if: RUBY_VERSION.to_f >= 2.5 do
+    it "sets the minimum version to TLS 1.0" do
       conn = create_connection(site)
       expect(conn.min_version).to eq(OpenSSL::SSL::TLS1_VERSION)
     end

data/spec/unit/http/service/compiler_spec.rb

@@ -68,7 +68,7 @@ describe Puppet::HTTP::Service::Compiler do
       subject.post_catalog(certname, environment: environment, facts: facts)
     end
 
-    it 'submits facts as pson if set as the preferred format' do
+    it 'submits facts as pson if set as the preferred format', if: Puppet.features.pson? do
       Puppet[:preferred_serialization_format] = "pson"
 
       stub_request(:post, uri)
@@ -141,20 +141,22 @@ describe Puppet::HTTP::Service::Compiler do
 
     it 'does not accept msgpack by default' do
       stub_request(:post, uri)
-        .with(headers: {'Accept' => 'application/vnd.puppet.rich+json, application/json, text/pson'})
+        .with(headers: {'Accept' => 'application/vnd.puppet.rich+json, application/json'})
         .to_return(**catalog_response)
 
       allow(Puppet.features).to receive(:msgpack?).and_return(false)
+      allow(Puppet.features).to receive(:pson?).and_return(false)
 
       subject.post_catalog(certname, environment: environment, facts: facts)
     end
 
     it 'accepts msgpack & rich_json_msgpack if the gem is present' do
       stub_request(:post, uri)
-        .with(headers: {'Accept' => 'application/vnd.puppet.rich+json, application/json, application/vnd.puppet.rich+msgpack, application/x-msgpack, text/pson'})
+        .with(headers: {'Accept' => 'application/vnd.puppet.rich+json, application/json, application/vnd.puppet.rich+msgpack, application/x-msgpack'})
         .to_return(**catalog_response)
 
       allow(Puppet.features).to receive(:msgpack?).and_return(true)
+      allow(Puppet.features).to receive(:pson?).and_return(false)
 
       subject.post_catalog(certname, environment: environment, facts: facts)
     end

data/spec/unit/http/service/file_server_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
+require 'puppet_spec/network'
 require 'puppet/http'
 
 describe Puppet::HTTP::Service::FileServer do
   include PuppetSpec::Files
+  include PuppetSpec::Network
 
   let(:ssl_context) { Puppet::SSL::SSLContext.new }
   let(:client) { Puppet::HTTP::Client.new(ssl_context: ssl_context) }
@@ -57,7 +59,7 @@ describe Puppet::HTTP::Service::FileServer do
 
     it 'submits a request for file metadata to the server' do
       stub_request(:get, url).with(
-        headers: {'Accept'=>'application/json, application/x-msgpack, text/pson',}
+        headers: {'Accept'=>acceptable_content_types_string}
       ).to_return(
         status: 200, body: filemetadata.render, headers: { 'Content-Type' => 'application/json' }
       )
@@ -139,7 +141,7 @@ describe Puppet::HTTP::Service::FileServer do
 
     it 'submits a request for file metadata to the server' do
       stub_request(:get, url).with(
-        headers: {'Accept'=>'application/json, application/x-msgpack, text/pson',}
+        headers: {'Accept' => acceptable_content_types_string}
       ).to_return(
         status: 200, body: formatter.render_multiple(filemetadatas), headers: { 'Content-Type' => 'application/json' }
       )
@@ -160,7 +162,7 @@ describe Puppet::HTTP::Service::FileServer do
     it 'automatically converts an array of parameters to the stringified query' do
       url = "https://www.example.com/puppet/v3/file_metadatas/:mount/#{path}?checksum_type=sha256&environment=testing&ignore=CVS&ignore=.git&ignore=.hg&links=manage&recurse=false&source_permissions=ignore"
       stub_request(:get, url).with(
-        headers: {'Accept'=>'application/json, application/x-msgpack, text/pson',}
+        headers: {'Accept'=>acceptable_content_types_string}
       ).to_return(
         status: 200, body: formatter.render_multiple(filemetadatas), headers: { 'Content-Type' => 'application/json' }
       )

data/spec/unit/http/service/report_spec.rb

@@ -1,7 +1,10 @@
 require 'spec_helper'
+require 'puppet_spec/network'
 require 'puppet/http'
 
 describe Puppet::HTTP::Service::Report do
+  include PuppetSpec::Network
+
   let(:ssl_context) { Puppet::SSL::SSLContext.new }
   let(:client) { Puppet::HTTP::Client.new(ssl_context: ssl_context) }
   let(:subject) { client.create_session.route_to(:report) }
@@ -64,7 +67,7 @@ describe Puppet::HTTP::Service::Report do
       stub_request(:put, url)
         .with(
           headers: {
-            'Accept'=>'application/json, application/x-msgpack, text/pson',
+            'Accept'=>acceptable_content_types_string,
             'Content-Type'=>'application/json',
            }).
          to_return(status: 200, body: "", headers: {})
@@ -100,18 +103,5 @@ describe Puppet::HTTP::Service::Report do
         expect(err.response.code).to eq(400)
       end
     end
-
-    it 'raises an error if unsuccessful, the server version is < 5, and the current serialization format is not pson' do
-      Puppet[:preferred_serialization_format] = 'json'
-
-      stub_request(:put, url).to_return(status: [400, 'Bad Request'], headers: {'X-Puppet-Version' => '4.2.3' })
-
-      expect {
-        subject.put_report('infinity', report, environment: environment)
-      }.to raise_error do |err|
-        expect(err).to be_an_instance_of(Puppet::HTTP::ProtocolError)
-        expect(err.message).to eq('To submit reports to a server running puppetserver 4.2.3, set preferred_serialization_format to pson')
-      end
-    end
   end
 end

data/spec/unit/http/service_spec.rb

@@ -1,10 +1,13 @@
 require 'spec_helper'
+require 'puppet_spec/network'
 require 'puppet/http'
 require 'puppet/file_serving'
 require 'puppet/file_serving/content'
 require 'puppet/file_serving/metadata'
 
 describe Puppet::HTTP::Service do
+  include PuppetSpec::Network
+
   let(:ssl_context) { Puppet::SSL::SSLContext.new }
   let(:client) { Puppet::HTTP::Client.new(ssl_context: ssl_context) }
   let(:session) { Puppet::HTTP::Session.new(client, []) }
@@ -114,11 +117,7 @@ describe Puppet::HTTP::Service do
   end
 
   it 'returns different mime types for different models' do
-    mimes = if Puppet.features.msgpack?
-              %w[application/json application/x-msgpack text/pson]
-            else
-              %w[application/json text/pson]
-            end
+    mimes = acceptable_content_types
 
     service = TestService.new(client, session, url)
     [
@@ -133,11 +132,6 @@ describe Puppet::HTTP::Service do
     # These are special
     expect(service.mime_types(Puppet::FileServing::Content)).to eq(%w[application/octet-stream])
 
-    catalog_mimes = if Puppet.features.msgpack?
-                      %w[application/vnd.puppet.rich+json application/json application/vnd.puppet.rich+msgpack application/x-msgpack text/pson]
-                    else
-                      %w[application/vnd.puppet.rich+json application/json text/pson]
-                    end
-    expect(service.mime_types(Puppet::Resource::Catalog)).to eq(catalog_mimes)
+    expect(service.mime_types(Puppet::Resource::Catalog)).to eq(acceptable_catalog_content_types)
   end
 end

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

@@ -321,7 +321,7 @@ describe Puppet::Resource::Catalog::Compiler do
         expect(facts.timestamp).to eq(time)
       end
 
-      it "accepts PSON facts from older agents" do
+      it "accepts PSON facts from older agents", :if => Puppet.features.pson? do
         request = a_legacy_request_that_contains(facts)
 
         facts = compiler.extract_facts_from_request(request)
@@ -432,9 +432,9 @@ describe Puppet::Resource::Catalog::Compiler do
     before do
       allow(Puppet).to receive(:version).and_return(1)
       set_facts({
-        'fqdn'       => "my.server.com",
-        'ipaddress'  => "my.ip.address",
-        'ipaddress6' => nil
+        'networking.fqdn' => "my.server.com",
+        'networking.ip'   => "my.ip.address",
+        'networking.ip6'  => nil
         })
       @request = Puppet::Indirector::Request.new(:catalog, :find, node_name, nil)
       allow(compiler).to receive(:compile)
@@ -467,16 +467,16 @@ describe Puppet::Resource::Catalog::Compiler do
     before do |example|
       allow(Puppet).to receive(:version).and_return(1)
       set_facts({
-        'fqdn'       => "my.server.com",
-        'ipaddress'  => nil,
+        'networking.fqdn' => "my.server.com",
+        'networking.ip'   => nil,
       })
       if example.metadata[:nil_ipv6]
         set_facts({
-          'ipaddress6' => nil
+          'networking.ip6' => nil
         })
       else
         set_facts({
-          'ipaddress6' => "my.ipv6.address"
+          'networking.ip6' => "my.ipv6.address"
         })
       end
       @request = Puppet::Indirector::Request.new(:catalog, :find, node_name, nil)
@@ -514,9 +514,10 @@ describe Puppet::Resource::Catalog::Compiler do
 
     it "should not add 'pe_serverversion' when FOSS" do
       allow(Puppet::Node.indirection).to receive(:find).with(node_name, anything).and_return(node)
-      catalog = compiler.find(request)
-
-      expect(catalog.resource('notify', 'PE Version: 2019.2.0')).to be_nil
+      expect {
+        catalog = compiler.find(request)
+        catalog.resource('notify', 'PE Version: 2019.2.0') 
+      }.to raise_error(/Evaluation Error: Unknown variable: 'pe_serverversion'./)
     end
 
     it "should add 'pe_serverversion' when PE" do