puppet 4.10.12-universal-darwin → 5.0.0-universal-darwin

data/spec/lib/matchers/json.rb

@@ -5,11 +5,11 @@ module JSONMatchers
     end
 
     def format
-      @format ||= Puppet::Network::FormatHandler.format('pson')
+      @format ||= Puppet::Network::FormatHandler.format('json')
     end
 
     def json(instance)
-      PSON.parse(instance.to_pson)
+      JSON.parse(instance.to_json)
     end
 
     def attr_value(attrs, instance)
@@ -59,7 +59,7 @@ module JSONMatchers
     end
 
     def format
-      @format ||= Puppet::Network::FormatHandler.format('pson')
+      @format ||= Puppet::Network::FormatHandler.format('json')
     end
 
     def from(value)

data/spec/lib/puppet/indirector_testing.rb

@@ -21,6 +21,10 @@ class Puppet::IndirectorTesting
     new(data['value'])
   end
 
+  def to_binary
+    value
+  end
+
   def to_data_hash
     { 'value' => value }
   end

data/spec/lib/puppet_spec/compiler.rb

@@ -34,7 +34,7 @@ module PuppetSpec::Compiler
       catalog.resources.each { |res| yield res }
     end
     transaction = Puppet::Transaction.new(catalog,
-                                         Puppet::Transaction::Report.new("apply"),
+                                         Puppet::Transaction::Report.new,
                                          prioritizer)
     transaction.evaluate
     transaction.report.finalize_report

data/spec/lib/puppet_spec/modules.rb

@@ -16,7 +16,7 @@ module PuppetSpec::Modules
         metadata[:name] = "#{metadata[:author]}/#{name}"
 
         File.open(File.join(module_dir, 'metadata.json'), 'w') do |f|
-          f.write(metadata.to_pson)
+          f.write(metadata.to_json)
         end
       end
 
@@ -29,7 +29,7 @@ module PuppetSpec::Modules
 
       if metadata = options[:metadata]
         File.open(File.join(module_dir, 'metadata.json'), 'w') do |f|
-          f.write(metadata.to_pson)
+          f.write(metadata.to_json)
         end
       end
     end

data/spec/lib/puppet_spec/network.rb

@@ -25,6 +25,10 @@ module PuppetSpec::Network
     Puppet::Network::HTTP::Error::HTTPMethodNotAllowedError
   end
 
+  def unsupported_media_type_error
+    Puppet::Network::HTTP::Error::HTTPUnsupportedMediaTypeError
+  end
+
   def params
     { :environment => "production" }
   end
@@ -41,7 +45,7 @@ module PuppetSpec::Network
     Puppet::Network::HTTP::Request.from_hash({
       :headers => {
         'accept' => request[:accept_header],
-        'content-type' => "text/pson"
+        'content-type' => "application/json"
       },
       :method => "HEAD",
       :path => "#{master_url_prefix}/#{data.class.indirection.name}/#{data.value}",
@@ -53,12 +57,12 @@ module PuppetSpec::Network
     Puppet::Network::HTTP::Request.from_hash({
       :headers => {
         'accept' => request[:accept_header],
-        'content-type' => request[:content_type_header] || "text/pson"
+        'content-type' => request[:content_type_header] || "application/json"
       },
       :method => "PUT",
       :path => "#{master_url_prefix}/#{data.class.indirection.name}/#{data.value}",
       :params => params,
-      :body => request[:body].nil? ? data.render("pson") : request[:body]
+      :body => request[:body].nil? ? data.render("json") : request[:body]
     })
   end
 
@@ -66,7 +70,7 @@ module PuppetSpec::Network
     Puppet::Network::HTTP::Request.from_hash({
       :headers => {
         'accept' => request[:accept_header],
-        'content-type' => "text/pson"
+        'content-type' => "application/json"
       },
       :method => "DELETE",
       :path => "#{master_url_prefix}/#{data.class.indirection.name}/#{data.value}",
@@ -79,7 +83,7 @@ module PuppetSpec::Network
     Puppet::Network::HTTP::Request.from_hash({
       :headers => {
         'accept' => request[:accept_header],
-        'content-type' => "text/pson"
+        'content-type' => "application/json"
       },
       :method => "GET",
       :path => "#{master_url_prefix}/#{data.class.indirection.name}/#{data.value}",
@@ -92,7 +96,7 @@ module PuppetSpec::Network
     Puppet::Network::HTTP::Request.from_hash({
       :headers => {
         'accept' => request[:accept_header],
-        'content-type' => "text/pson"
+        'content-type' => "application/json"
       },
       :method => "GET",
       :path => "#{master_url_prefix}/#{data.class.indirection.name}s/#{data.name}",

data/spec/shared_contexts/types_setup.rb

@@ -5,8 +5,8 @@ shared_context 'types_setup' do
     [ Puppet::Pops::Types::PAnyType,
       Puppet::Pops::Types::PUndefType,
       Puppet::Pops::Types::PNotUndefType,
-      Puppet::Pops::Types::PDataType,
       Puppet::Pops::Types::PScalarType,
+      Puppet::Pops::Types::PScalarDataType,
       Puppet::Pops::Types::PStringType,
       Puppet::Pops::Types::PNumericType,
       Puppet::Pops::Types::PIntegerType,
@@ -44,10 +44,28 @@ shared_context 'types_setup' do
     self.class.all_types
   end
 
+  def self.scalar_data_types
+    # PVariantType is also scalar data, if its types are all ScalarData
+    [
+      Puppet::Pops::Types::PScalarDataType,
+      Puppet::Pops::Types::PStringType,
+      Puppet::Pops::Types::PNumericType,
+      Puppet::Pops::Types::PIntegerType,
+      Puppet::Pops::Types::PFloatType,
+      Puppet::Pops::Types::PBooleanType,
+      Puppet::Pops::Types::PEnumType,
+    ]
+  end
+  def scalar_data_types
+    self.class.scalar_data_types
+  end
+
+
   def self.scalar_types
     # PVariantType is also scalar, if its types are all Scalar
     [
       Puppet::Pops::Types::PScalarType,
+      Puppet::Pops::Types::PScalarDataType,
       Puppet::Pops::Types::PStringType,
       Puppet::Pops::Types::PNumericType,
       Puppet::Pops::Types::PIntegerType,
@@ -57,7 +75,6 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PPatternType,
       Puppet::Pops::Types::PEnumType,
       Puppet::Pops::Types::PSemVerType,
-      Puppet::Pops::Types::PSemVerRangeType,
       Puppet::Pops::Types::PTimespanType,
       Puppet::Pops::Types::PTimestampType,
     ]
@@ -105,20 +122,22 @@ shared_context 'types_setup' do
   end
 
   def self.data_compatible_types
-    result = scalar_types
-    result << Puppet::Pops::Types::PDataType
-    result << Puppet::Pops::Types::PArrayType::DATA
-    result << Puppet::Pops::Types::PHashType::DATA
+    result = scalar_data_types
+    result << Puppet::Pops::Types::PArrayType.new(Puppet::Pops::Types::PScalarDataType::DEFAULT)
+    result << Puppet::Pops::Types::PHashType.new(Puppet::Pops::Types::PStringType::DEFAULT, Puppet::Pops::Types::PScalarDataType::DEFAULT)
     result << Puppet::Pops::Types::PUndefType
-    result << Puppet::Pops::Types::PNotUndefType.new(Puppet::Pops::Types::PDataType::DEFAULT)
-    result << Puppet::Pops::Types::PTupleType.new([Puppet::Pops::Types::PDataType::DEFAULT], Puppet::Pops::Types::PIntegerType.new(0, nil))
+    result << Puppet::Pops::Types::PNotUndefType.new(Puppet::Pops::Types::PScalarDataType::DEFAULT)
+    result << Puppet::Pops::Types::PTupleType.new([Puppet::Pops::Types::PScalarDataType::DEFAULT])
     result
   end
   def data_compatible_types
     self.class.data_compatible_types
   end
 
-  def type_from_class(c)
+  def self.type_from_class(c)
     c.is_a?(Class) ? c::DEFAULT : c
   end
+  def type_from_class(c)
+    self.class.type_from_class(c)
+  end
 end

data/spec/spec_helper.rb

@@ -84,17 +84,6 @@ RSpec.configure do |config|
   oldtmpdir = Puppet::FileSystem.expand_path(Dir.tmpdir())
   ENV['TMPDIR'] = tmpdir
 
-  if Puppet::Util::Platform.windows?
-    config.output_stream = $stdout
-    config.error_stream = $stderr
-
-    config.formatters.each do |f|
-      if not f.instance_variable_get(:@output).kind_of?(::File)
-        f.instance_variable_set(:@output, $stdout)
-      end
-    end
-  end
-
   Puppet::Test::TestHelper.initialize
 
   config.before :all do

data/spec/unit/agent_spec.rb

@@ -66,7 +66,7 @@ describe Puppet::Agent do
   it "should initialize the client's transaction_uuid if passed as a client_option" do
     client = mock 'client'
     transaction_uuid = 'foo'
-    AgentTestClient.expects(:new).with(anything, transaction_uuid).returns client
+    AgentTestClient.expects(:new).with(anything, transaction_uuid, nil).returns client
 
     client.expects(:run)
 
@@ -74,6 +74,17 @@ describe Puppet::Agent do
     @agent.run(:transaction_uuid => transaction_uuid)
   end
 
+  it "should initialize the client's job_id if passed as a client_option" do
+    client = mock 'client'
+    job_id = '289'
+    AgentTestClient.expects(:new).with(anything, anything, job_id).returns client
+
+    client.expects(:run)
+
+    @agent.stubs(:disabled?).returns false
+    @agent.run(:job_id => job_id)
+  end
+
   it "should be considered running if the lock file is locked" do
     lockfile = mock 'lockfile'
 
@@ -236,39 +247,6 @@ describe Puppet::Agent do
         expect(agent.should_fork).to be_falsey
       end
     end
-
-    describe 'when runtimeout is set' do
-      before(:each) do
-        Puppet[:runtimeout] = 1
-      end
-
-      it 'times out when a run exceeds the set limit' do
-        client = AgentTestClient.new
-        client.instance_eval do
-          # Stub methods used to set test expectations.
-          def processing; end
-          def handling; end
-
-          def run(client_options = {})
-            # Simulate a hanging agent operation that also traps errors.
-            begin
-              ::Kernel.sleep(5)
-              processing()
-            rescue
-              handling()
-            end
-          end
-        end
-
-        AgentTestClient.expects(:new).returns client
-
-        client.expects(:processing).never
-        client.expects(:handling).never
-        Puppet.expects(:log_exception).with(instance_of(Puppet::Agent::RunTimeoutError), anything)
-
-        expect(@agent.run).to eq(1)
-      end
-    end
   end
 
   describe "when checking execution state" do

data/spec/unit/application/agent_spec.rb

@@ -350,6 +350,15 @@ describe Puppet::Application::Agent do
       @puppetd.setup
     end
 
+    it "should set catalog cache class to nil during a noop run" do
+      Puppet[:catalog_cache_terminus] = "json"
+      Puppet[:noop] = true
+      Puppet::Resource::Catalog.indirection.expects(:cache_class=).with(nil)
+
+      @puppetd.initialize_app_defaults
+      @puppetd.setup
+    end
+
     it "should default facts_terminus setting to 'facter'" do
       @puppetd.initialize_app_defaults
       expect(Puppet[:facts_terminus]).to eq(:facter)
@@ -521,6 +530,13 @@ describe Puppet::Application::Agent do
         expect { execute_agent }.to exit_with 0
       end
 
+      it "should run the agent with the supplied job_id" do
+        @puppetd.options[:job_id] = 'special id'
+        @agent.expects(:run).with(:job_id => 'special id').returns(:report)
+
+        expect { execute_agent }.to exit_with 0
+      end
+
       it "should stop the daemon" do
         @daemon.expects(:stop).with(:exit => false)
 

data/spec/unit/application/apply_spec.rb

@@ -279,6 +279,15 @@ describe Puppet::Application::Apply do
         expect { @apply.main }.to exit_with 0
       end
 
+      it 'should make the Puppet::Pops::Loaders available when applying the compiled catalog' do
+        Puppet::Resource::Catalog.indirection.expects(:find).returns(@catalog)
+        @apply.expects(:apply_catalog).with(@catalog) do
+          fail('Loaders not found') unless Puppet.lookup(:loaders) { nil }.is_a?(Puppet::Pops::Loaders)
+          true
+        end.returns(0)
+        expect { @apply.main }.to exit_with 0
+      end
+
       it "should transform the catalog to ral" do
 
         @catalog.expects(:to_ral).returns(@catalog)
@@ -322,7 +331,7 @@ describe Puppet::Application::Apply do
 
       it "should save the last run summary" do
         Puppet[:noop] = false
-        report = Puppet::Transaction::Report.new("apply")
+        report = Puppet::Transaction::Report.new
         Puppet::Transaction::Report.stubs(:new).returns(report)
 
         Puppet::Configurer.any_instance.expects(:save_last_run_summary).with(report)
@@ -404,7 +413,7 @@ describe Puppet::Application::Apply do
       # We want this memoized, and to be able to adjust the content, so we
       # have to do it ourselves.
       def temporary_catalog(content = '"something"')
-        @tempfile = Tempfile.new('catalog.pson')
+        @tempfile = Tempfile.new('catalog.json')
         @tempfile.write(content)
         @tempfile.close
         @tempfile.path
@@ -413,7 +422,7 @@ describe Puppet::Application::Apply do
       it "should read the catalog in from disk if a file name is provided" do
         @apply.options[:catalog] = temporary_catalog
         catalog = Puppet::Resource::Catalog.new("testing", Puppet::Node::Environment::NONE)
-        Puppet::Resource::Catalog.stubs(:convert_from).with(:pson,'"something"').returns(catalog)
+        Puppet::Resource::Catalog.stubs(:convert_from).with(:json,'"something"').returns(catalog)
         @apply.apply
       end
 
@@ -421,7 +430,7 @@ describe Puppet::Application::Apply do
         @apply.options[:catalog] = "-"
         $stdin.expects(:read).returns '"something"'
         catalog = Puppet::Resource::Catalog.new("testing", Puppet::Node::Environment::NONE)
-        Puppet::Resource::Catalog.stubs(:convert_from).with(:pson,'"something"').returns(catalog)
+        Puppet::Resource::Catalog.stubs(:convert_from).with(:json,'"something"').returns(catalog)
         @apply.apply
       end
 
@@ -438,18 +447,10 @@ describe Puppet::Application::Apply do
         expect { @apply.apply }.to raise_error(Puppet::Error)
       end
 
-      it "should convert plain data structures into a catalog if deserialization does not do so" do
-        @apply.options[:catalog] = temporary_catalog
-        Puppet::Resource::Catalog.stubs(:convert_from).with(:pson,'"something"').returns({:foo => "bar"})
-        catalog = Puppet::Resource::Catalog.new("testing", Puppet::Node::Environment::NONE)
-        Puppet::Resource::Catalog.expects(:pson_create).with({:foo => "bar"}).returns(catalog)
-        @apply.apply
-      end
-
       it "should convert the catalog to a RAL catalog and use a Configurer instance to apply it" do
         @apply.options[:catalog] = temporary_catalog
         catalog = Puppet::Resource::Catalog.new("testing", Puppet::Node::Environment::NONE)
-        Puppet::Resource::Catalog.stubs(:convert_from).with(:pson,'"something"').returns catalog
+        Puppet::Resource::Catalog.stubs(:convert_from).with(:json,'"something"').returns catalog
         catalog.expects(:to_ral).returns "mycatalog"
 
         configurer = stub 'configurer'
@@ -459,6 +460,20 @@ describe Puppet::Application::Apply do
 
         @apply.apply
       end
+
+      it 'should make the Puppet::Pops::Loaders available when applying a catalog' do
+        @apply.options[:catalog] = temporary_catalog
+        catalog = Puppet::Resource::Catalog.new("testing", Puppet::Node::Environment::NONE)
+        @apply.expects(:read_catalog).with('something') do
+          fail('Loaders not found') unless Puppet.lookup(:loaders) { nil }.is_a?(Puppet::Pops::Loaders)
+          true
+        end.returns(catalog)
+        @apply.expects(:apply_catalog).with(catalog) do
+          fail('Loaders not found') unless Puppet.lookup(:loaders) { nil }.is_a?(Puppet::Pops::Loaders)
+          true
+        end
+        expect { @apply.apply }.not_to raise_error
+      end
     end
   end
 
@@ -478,4 +493,13 @@ describe Puppet::Application::Apply do
     @apply.initialize_app_defaults
     @apply.setup
   end
+
+  it "should set catalog cache class to nil during a noop run" do
+    Puppet[:catalog_cache_terminus] = "json"
+    Puppet[:noop] = true
+    Puppet::Resource::Catalog.indirection.expects(:cache_class=).with(nil)
+
+    @apply.initialize_app_defaults
+    @apply.setup
+  end
 end

data/spec/unit/application/cert_spec.rb

@@ -139,7 +139,7 @@ describe Puppet::Application::Cert => true do
   describe "when running" do
     before :each do
       @cert_app.all = false
-      @ca = stub_everything( 'ca', :waiting? => ['unsigned-node'] )
+      @ca = stub_everything 'ca'
       @cert_app.ca = @ca
       @cert_app.command_line.stubs(:args).returns([])
       @iface = stub_everything 'iface'
@@ -186,45 +186,6 @@ describe Puppet::Application::Cert => true do
 
       @cert_app.main
     end
-
-    it "should not revoke cert if node does not have a signed certificate" do
-      @cert_app.subcommand = :destroy
-      @cert_app.command_line.stubs(:args).returns(["unsigned-node"])
-
-      Puppet::SSL::CertificateAuthority::Interface.unstub(:new)
-      Puppet::SSL::CertificateAuthority::Interface.expects(:new).with(:revoke, anything).never
-      Puppet::SSL::CertificateAuthority::Interface.expects(:new).with(:destroy, {:to => ['unsigned-node'], :digest => nil}).returns(@iface)
-
-      @cert_app.main
-    end
-
-    it "should only revoke signed certificate and destroy certificate signing requests" do
-      @cert_app.subcommand = :destroy
-      @cert_app.command_line.stubs(:args).returns(["host","unsigned-node"])
-
-      Puppet::SSL::CertificateAuthority::Interface.expects(:new).returns(@iface).with { |cert_mode,to|
-        cert_mode == :revoke
-        to[:to] == ["host"]
-      }
-      Puppet::SSL::CertificateAuthority::Interface.expects(:new).returns(@iface).with { |cert_mode,to|
-        cert_mode == :destroy
-        to[:to] == ["host","unsigned-node"]
-      }
-
-      @cert_app.main
-    end
-
-    it "should refuse to destroy all certificates" do
-      @cert_app.subcommand = :destroy
-      @cert_app.all = true
-
-      Puppet::SSL::CertificateAuthority::Interface.unstub(:new)
-      Puppet::SSL::CertificateAuthority::Interface.expects(:new).never
-
-      Puppet.expects(:log_exception).with {|e| e.message == "Refusing to destroy all certs, provide an explicit list of certs to destroy"}
-
-      expect { @cert_app.main }.to exit_with(24)
-    end
   end
 
   describe "when identifying subcommands" do