puppet 5.5.22-x64-mingw32 → 6.0.0-x64-mingw32

data/spec/integration/application/doc_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/files'
 require 'puppet/application/doc'
@@ -7,7 +8,7 @@ describe Puppet::Application::Doc do
 
   it "should respect the -o option" do
     puppetdoc = Puppet::Application[:doc]
-    allow(puppetdoc.command_line).to receive(:args).and_return(['foo', '-o', 'bar'])
+    puppetdoc.command_line.stubs(:args).returns(['foo', '-o', 'bar'])
     puppetdoc.parse_options
     expect(puppetdoc.options[:outputdir]).to eq('bar')
   end

data/spec/integration/application/lookup_spec.rb

@@ -52,7 +52,7 @@ describe 'lookup' do
 
     def lookup(key, options = {}, explain = false)
       key = [key] unless key.is_a?(Array)
-      allow(app.command_line).to receive(:args).and_return(key)
+      app.command_line.stubs(:args).returns(key)
       if explain
         app.options[:explain] = true
         app.options[:render_as] = :s
@@ -98,15 +98,15 @@ describe 'lookup' do
 
       it ':plain without --compile' do
         Puppet.settings[:node_terminus] = 'exec'
-        expect_any_instance_of(Puppet::Node::Plain).to receive(:find).and_return(node)
-        expect_any_instance_of(Puppet::Node::Exec).not_to receive(:find)
+        Puppet::Node::Plain.any_instance.expects(:find).returns(node)
+        Puppet::Node::Exec.any_instance.expects(:find).never
         expect(lookup('a')).to eql('value a')
       end
 
       it 'configured in Puppet settings with --compile' do
         Puppet.settings[:node_terminus] = 'exec'
-        expect_any_instance_of(Puppet::Node::Plain).not_to receive(:find)
-        expect_any_instance_of(Puppet::Node::Exec).to receive(:find).and_return(node)
+        Puppet::Node::Plain.any_instance.expects(:find).never
+        Puppet::Node::Exec.any_instance.expects(:find).returns(node)
         expect(lookup('a', :compile => true)).to eql('value a')
       end
     end

data/spec/integration/configurer_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/configurer'
@@ -19,10 +20,10 @@ describe Puppet::Configurer do
     end
 
     it "should send a transaction report with valid data" do
-      allow(@configurer).to receive(:save_last_run_summary)
-      expect(Puppet::Transaction::Report.indirection).to receive(:save) do |report, x|
-        expect(report.time).to be_a(Time)
-        expect(report.logs.length).to be > 0
+
+      @configurer.stubs(:save_last_run_summary)
+      Puppet::Transaction::Report.indirection.expects(:save).with do |report, x|
+        report.time.class == Time and report.logs.length > 0
       end
 
       Puppet[:report] = true
@@ -32,7 +33,7 @@ describe Puppet::Configurer do
 
     it "should save a correct last run summary" do
       report = Puppet::Transaction::Report.new
-      allow(Puppet::Transaction::Report.indirection).to receive(:save)
+      Puppet::Transaction::Report.indirection.stubs(:save)
 
       Puppet[:lastrunfile] = tmpfile("lastrunfile")
       Puppet.settings.setting(:lastrunfile).mode = 0666
@@ -46,14 +47,11 @@ describe Puppet::Configurer do
       t2 = Time.now.tv_sec
 
       # sticky bit only applies to directories in windows
-      file_mode = Puppet.features.microsoft_windows? ? '666' : '100666'
+      file_mode = Puppet::Util::Platform.windows? ? '666' : '100666'
 
       expect(Puppet::FileSystem.stat(Puppet[:lastrunfile]).mode.to_s(8)).to eq(file_mode)
 
-      summary = nil
-      File.open(Puppet[:lastrunfile], "r") do |fd|
-        summary = YAML.load(fd.read)
-      end
+      summary = Puppet::Util::Yaml.safe_load_file(Puppet[:lastrunfile])
 
       expect(summary).to be_a(Hash)
       %w{time changes events resources}.each do |key|
@@ -62,71 +60,5 @@ describe Puppet::Configurer do
       expect(summary["time"]).to be_key("notify")
       expect(summary["time"]["last_run"]).to be_between(t1, t2)
     end
-
-    it "applies a cached catalog if pluginsync fails when usecacheonfailure is true" do
-      Puppet[:ignore_plugin_errors] = false
-
-      Puppet[:use_cached_catalog] = false
-      Puppet[:usecacheonfailure] = true
-
-      report = Puppet::Transaction::Report.new
-      expect_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate).and_raise(Puppet::Error, 'Failed to retrieve: some file')
-      expect(Puppet::Resource::Catalog.indirection).to receive(:find).and_return(@catalog)
-
-      @configurer.run(pluginsync: true, report: report)
-      expect(report.cached_catalog_status).to eq('on_failure')
-    end
-
-    describe 'resubmitting facts' do
-      context 'when resubmit_facts is set to false' do
-        it 'should not send data' do
-          expect(@configurer).to receive(:resubmit_facts).never
-
-          @configurer.run(catalog: @catalog)
-        end
-      end
-
-      context 'when resubmit_facts is set to true' do
-        let(:test_facts) { Puppet::Node::Facts.new('configurer.test') }
-        let(:fact_rest_terminus) { Puppet::Node::Facts.indirection.terminus(:rest) }
-
-        before(:each) do
-          Puppet[:resubmit_facts] = true
-
-          allow(@configurer).to receive(:find_facts).and_return(test_facts)
-          allow(fact_rest_terminus).to receive(:save)
-        end
-
-        it 'sends fact data using the rest terminus' do
-          expect(fact_rest_terminus).to receive(:save)
-
-          @configurer.run(catalog: @catalog)
-        end
-
-        it 'logs errors that occur during fact generation' do
-          allow(@configurer).to receive(:find_facts).and_raise('error generating facts')
-          expect(Puppet).to receive(:log_exception).with(instance_of(RuntimeError),
-                                                         /^Failed to submit facts/)
-
-          @configurer.run(catalog: @catalog)
-        end
-
-        it 'logs errors that occur during fact submission' do
-          allow(fact_rest_terminus).to receive(:save).and_raise('error sending facts')
-          expect(Puppet).to receive(:log_exception).with(instance_of(RuntimeError),
-                                                         /^Failed to submit facts/)
-
-          @configurer.run(catalog: @catalog)
-        end
-
-        it 'records time spent resubmitting facts' do
-          report = Puppet::Transaction::Report.new
-
-          @configurer.run(catalog: @catalog, report: report)
-
-          expect(report.metrics['time'].values).to include(["resubmit_facts", anything, Numeric])
-        end
-      end
-    end
   end
 end

data/spec/integration/data_binding_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
+require 'puppet/indirector/hiera'
 
 require 'puppet_spec/compiler'
-require 'puppet/indirector/data_binding/hiera'
 
 describe "Data binding" do
   include PuppetSpec::Files

data/spec/integration/defaults_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/defaults'
@@ -25,7 +26,7 @@ describe "Puppet defaults" do
 
   describe "when setting the :factpath" do
     it "should add the :factpath to Facter's search paths" do
-      expect(Facter).to receive(:search).with("/my/fact/path")
+      Facter.expects(:search).with("/my/fact/path")
 
       Puppet.settings[:factpath] = "/my/fact/path"
     end
@@ -82,19 +83,19 @@ describe "Puppet defaults" do
   end
 
   it "should use the service user and group for the yamldir" do
-    allow(Puppet.settings).to receive(:service_user_available?).and_return(true)
-    allow(Puppet.settings).to receive(:service_group_available?).and_return(true)
+    Puppet.settings.stubs(:service_user_available?).returns true
+    Puppet.settings.stubs(:service_group_available?).returns true
     expect(Puppet.settings.setting(:yamldir).owner).to eq(Puppet.settings[:user])
     expect(Puppet.settings.setting(:yamldir).group).to eq(Puppet.settings[:group])
   end
 
   it "should specify that the host private key should be owned by the service user" do
-    allow(Puppet.settings).to receive(:service_user_available?).and_return(true)
+    Puppet.settings.stubs(:service_user_available?).returns true
     expect(Puppet.settings.setting(:hostprivkey).owner).to eq(Puppet.settings[:user])
   end
 
   it "should specify that the host certificate should be owned by the service user" do
-    allow(Puppet.settings).to receive(:service_user_available?).and_return(true)
+    Puppet.settings.stubs(:service_user_available?).returns true
     expect(Puppet.settings.setting(:hostcert).owner).to eq(Puppet.settings[:user])
   end
 
@@ -114,7 +115,7 @@ describe "Puppet defaults" do
     end
   end
 
-  describe "on a Windows-like platform it", :if => Puppet.features.microsoft_windows? do
+  describe "on a Windows-like platform it", :if => Puppet::Util::Platform.windows? do
     let (:rune_utf8) { "\u16A0\u16C7\u16BB\u16EB\u16D2\u16E6\u16A6\u16EB\u16A0\u16B1\u16A9\u16A0\u16A2\u16B1\u16EB\u16A0\u16C1\u16B1\u16AA\u16EB\u16B7\u16D6\u16BB\u16B9\u16E6\u16DA\u16B3\u16A2\u16D7" }
 
     it "path should not add anything" do
@@ -130,7 +131,8 @@ describe "Puppet defaults" do
       Puppet::Util.withenv( {"PATH" => path }, :windows) do
         Puppet.settings[:path] = "none" # this causes it to ignore the setting
 
-        expect(Puppet::Util.get_env('Path')).to eq(path)
+        envhash = Puppet::Util::Windows::Process.get_environment_strings
+        expect(envhash['Path']).to eq(path)
       end
     end
   end
@@ -161,11 +163,6 @@ describe "Puppet defaults" do
     end
   end
 
-  it "should have a :caname setting that defaults to the cert name" do
-    Puppet.settings[:certname] = "foo"
-    expect(Puppet.settings[:ca_name]).to eq("Puppet CA: foo")
-  end
-
   it "should have a 'prerun_command' that defaults to the empty string" do
     expect(Puppet.settings[:prerun_command]).to eq("")
   end
@@ -194,11 +191,11 @@ describe "Puppet defaults" do
   end
 
   describe "daemonize" do
-    it "should default to true", :unless => Puppet.features.microsoft_windows? do
+    it "should default to true", :unless => Puppet::Util::Platform.windows? do
       expect(Puppet.settings[:daemonize]).to eq(true)
     end
 
-    describe "on Windows", :if => Puppet.features.microsoft_windows? do
+    describe "on Windows", :if => Puppet::Util::Platform.windows? do
       it "should default to false" do
         expect(Puppet.settings[:daemonize]).to eq(false)
       end
@@ -210,11 +207,11 @@ describe "Puppet defaults" do
   end
 
   describe "diff" do
-    it "should default to 'diff' on POSIX", :unless => Puppet.features.microsoft_windows? do
+    it "should default to 'diff' on POSIX", :unless => Puppet::Util::Platform.windows? do
       expect(Puppet.settings[:diff]).to eq('diff')
     end
 
-    it "should default to '' on Windows", :if => Puppet.features.microsoft_windows? do
+    it "should default to '' on Windows", :if => Puppet::Util::Platform.windows? do
       expect(Puppet.settings[:diff]).to eq('')
     end
   end

data/spec/integration/directory_environments_spec.rb

@@ -4,7 +4,7 @@ describe "directory environments" do
   let(:args) { ['--configprint', 'modulepath', '--environment', 'direnv'] }
   let(:puppet) do
     app = Puppet::Application[:apply]
-    allow(app).to receive(:command_line).and_return(double('command_line', :args => []))
+    app.stubs(:command_line).returns(stub('command_line', :args => []))
     app
   end
 

data/spec/integration/faces/config_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/face'
 
@@ -64,7 +65,7 @@ rando_key=foobar
     end
 
     before :each do
-      allow(subject).to receive(:report_section_and_environment)
+      subject.stubs(:report_section_and_environment)
     end
 
     # key must be a defined setting
@@ -73,13 +74,13 @@ rando_key=foobar
         value = "value#{key.reverse}value"
 
         # needed for the subject.set to write to correct file
-        allow(Puppet.settings).to receive(:which_configuration_file).and_return(tmp_config)
+        Puppet.settings.stubs(:which_configuration_file).returns(tmp_config)
         subject.set(key, value)
 
         # make sure subject.print looks at the newly modified settings
         test_settings = load_settings(tmp_config)
         # instead of the default Puppet.settings (implementation detail)
-        allow(Puppet).to receive(:settings).and_return(test_settings)
+        Puppet.stubs(:settings).returns(test_settings)
 
         result = subject.print()
         expect(render(:print, result)).to match(/^#{key} = #{value}$/)

data/spec/integration/faces/documentation_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/face'
 

data/spec/integration/faces/plugin_spec.rb

@@ -1,41 +1,61 @@
 require 'spec_helper'
-require 'webmock/rspec'
+require 'puppet/face'
+require 'puppet/file_serving/metadata'
+require 'puppet/file_serving/content'
+require 'puppet/indirector/memory'
+require 'puppet/indirector/file_metadata'
+require 'puppet/indirector/file_content'
 
+module PuppetFaceIntegrationSpecs
 describe "Puppet plugin face" do
-  before :each do
-    metadata = "[{\"path\":\"/etc/puppetlabs/code\",\"relative_path\":\".\",\"links\":\"follow\",\"owner\":0,\"group\":0,\"mode\":420,\"checksum\":{\"type\":\"ctime\",\"value\":\"{ctime}2020-07-10 14:00:00 -0700\"},\"type\":\"directory\",\"destination\":null}]"
-    stub_request(:get, %r{/puppet/v3/file_metadatas/(plugins|locales)}).to_return(status: 200, body: metadata, headers: {'Content-Type' => 'application/json'})
+  INDIRECTORS = [
+    Puppet::Indirector::FileMetadata,
+    Puppet::Indirector::FileContent,
+  ]
 
-    # response retains owner/group/mode due to source_permissions => use
-    facts_metadata = "[{\"path\":\"/etc/puppetlabs/code\",\"relative_path\":\".\",\"links\":\"follow\",\"owner\":500,\"group\":500,\"mode\":493,\"checksum\":{\"type\":\"ctime\",\"value\":\"{ctime}2020-07-10 14:00:00 -0700\"},\"type\":\"directory\",\"destination\":null}]"
-    stub_request(:get, %r{/puppet/v3/file_metadatas/pluginfacts}).to_return(status: 200, body: facts_metadata, headers: {'Content-Type' => 'application/json'})
+  INDIRECTED_CLASSES = [
+    Puppet::FileServing::Metadata,
+    Puppet::FileServing::Content,
+    Puppet::Node::Facts,
+  ]
+
+  INDIRECTORS.each do |indirector|
+    class indirector::Memory < Puppet::Indirector::Memory
+      def find(request)
+        model.new('/dev/null', { 'type' => 'directory' })
+      end
+    end
   end
 
-  it "processes a download request resulting in no changes" do
-    # /opt/puppetlabs/puppet/cache/facts.d will be created based on our umask.
-    # If the mode on disk is not 0755, then the mode from the metadata response
-    # (493 => 0755) will be applied, resulting in "plugins were downloaded"
-    # message. Enforce a umask so the results are consistent.
-    Puppet::FileSystem.mkpath(Puppet[:pluginfactdest])
-    Puppet::FileSystem.chmod(0755, Puppet[:pluginfactdest])
+  before do
+    FileUtils.mkdir(File.join(Puppet[:vardir], 'lib'))
+    FileUtils.mkdir(File.join(Puppet[:vardir], 'facts.d'))
+    FileUtils.mkdir(File.join(Puppet[:vardir], 'locales'))
+    @termini_classes = {}
+    INDIRECTED_CLASSES.each do |indirected|
+      @termini_classes[indirected] = indirected.indirection.terminus_class
+      indirected.indirection.terminus_class = :memory
+    end
+  end
 
-    app = Puppet::Application[:plugin]
-    app.command_line.args << 'download'
-    expect {
-      app.run
-    }.to exit_with(0)
-      .and output(/No plugins downloaded/).to_stdout
+  after do
+    INDIRECTED_CLASSES.each do |indirected|
+      indirected.indirection.terminus_class = @termini_classes[indirected]
+      indirected.indirection.termini.clear
+    end
   end
 
-  it "updates the facts.d mode", unless: Puppet::Util::Platform.windows? do
-    Puppet::FileSystem.mkpath(Puppet[:pluginfactdest])
-    Puppet::FileSystem.chmod(0775, Puppet[:pluginfactdest])
+  def init_cli_args_and_apply_app(args = ["download"])
+    Puppet::Application.find(:plugin).new(stub('command_line', :subcommand_name => :plugin, :args => args))
+  end
 
-    app = Puppet::Application[:plugin]
-    app.command_line.args << 'download'
-    expect {
-      app.run
-    }.to exit_with(0)
-     .and output(/Downloaded these plugins: .*facts\.d/).to_stdout
+  it "processes a download request" do
+    app = init_cli_args_and_apply_app
+    expect do
+      expect {
+        app.run
+      }.to exit_with(0)
+    end.to have_printed(/No plugins downloaded/)
   end
 end
+end

data/spec/integration/file_bucket/file_spec.rb

@@ -1,3 +1,5 @@
+#! /usr/bin/env ruby
+
 require 'spec_helper'
 
 require 'puppet/file_bucket/file'
@@ -6,24 +8,7 @@ describe Puppet::FileBucket::File do
   describe "#indirection" do
     before :each do
       # Never connect to the network, no matter what
-      allow_any_instance_of(described_class.indirection.terminus(:rest).class).to receive(:find)
-    end
-
-    describe "when running the master application" do
-      before :each do
-        Puppet::Application[:master].setup_terminuses
-      end
-
-      {
-        "md5/d41d8cd98f00b204e9800998ecf8427e" => :file,
-        "filebucket://puppetmaster:8140/md5/d41d8cd98f00b204e9800998ecf8427e" => :file,
-      }.each do |key, terminus|
-        it "should use the #{terminus} terminus when requesting #{key.inspect}" do
-          expect_any_instance_of(described_class.indirection.terminus(terminus).class).to receive(:find)
-
-          described_class.indirection.find(key)
-        end
-      end
+      described_class.indirection.terminus(:rest).class.any_instance.stubs(:find)
     end
 
     describe "when running another application" do
@@ -32,7 +17,7 @@ describe Puppet::FileBucket::File do
         "filebucket://puppetmaster:8140/md5/d41d8cd98f00b204e9800998ecf8427e" => :rest,
       }.each do |key, terminus|
         it "should use the #{terminus} terminus when requesting #{key.inspect}" do
-          expect_any_instance_of(described_class.indirection.terminus(terminus).class).to receive(:find)
+          described_class.indirection.terminus(terminus).class.any_instance.expects(:find)
 
           described_class.indirection.find(key)
         end

data/spec/integration/file_serving/content_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/file_serving/content'

data/spec/integration/file_serving/fileset_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/file_serving/fileset'