puppet 4.10.12-x64-mingw32 → 5.0.0-x64-mingw32

data/spec/unit/configurer/plugin_handler_spec.rb

@@ -14,29 +14,23 @@ describe Puppet::Configurer::PluginHandler do
     Puppet.expects(:err).never
   end
 
-  context "when external facts are supported" do
-    before :each do
-      Puppet.features.stubs(:external_facts?).returns(true)
-    end
+  it "downloads plugins and facts" do
+    plugin_downloader = stub('plugin-downloader', :evaluate => [])
+    facts_downloader = stub('facts-downloader', :evaluate => [])
 
-    it "downloads plugins and facts" do
-      plugin_downloader = stub('plugin-downloader', :evaluate => [])
-      facts_downloader = stub('facts-downloader', :evaluate => [])
+    factory.expects(:create_plugin_downloader).returns(plugin_downloader)
+    factory.expects(:create_plugin_facts_downloader).returns(facts_downloader)
 
-      factory.expects(:create_plugin_downloader).returns(plugin_downloader)
-      factory.expects(:create_plugin_facts_downloader).returns(facts_downloader)
-
-      pluginhandler.download_plugins(environment)
-    end
+    pluginhandler.download_plugins(environment)
+  end
 
-    it "returns downloaded plugin and fact filenames" do
-      plugin_downloader = stub('plugin-downloader', :evaluate => %w[/a])
-      facts_downloader = stub('facts-downloader', :evaluate => %w[/b])
+  it "returns downloaded plugin and fact filenames" do
+    plugin_downloader = stub('plugin-downloader', :evaluate => %w[/a])
+    facts_downloader = stub('facts-downloader', :evaluate => %w[/b])
 
-      factory.expects(:create_plugin_downloader).returns(plugin_downloader)
-      factory.expects(:create_plugin_facts_downloader).returns(facts_downloader)
+    factory.expects(:create_plugin_downloader).returns(plugin_downloader)
+    factory.expects(:create_plugin_facts_downloader).returns(facts_downloader)
 
-      expect(pluginhandler.download_plugins(environment)).to match_array(%w[/a /b])
-    end
+    expect(pluginhandler.download_plugins(environment)).to match_array(%w[/a /b])
   end
 end

data/spec/unit/configurer_spec.rb

@@ -117,7 +117,7 @@ describe Puppet::Configurer do
     end
 
     it "should initialize a transaction report if one is not provided" do
-      report = Puppet::Transaction::Report.new("apply")
+      report = Puppet::Transaction::Report.new
       Puppet::Transaction::Report.expects(:new).returns report
 
       @agent.run
@@ -127,14 +127,14 @@ describe Puppet::Configurer do
       Puppet[:node_name_fact] = 'my_name_fact'
       @facts.values = {'my_name_fact' => 'node_name_from_fact'}
 
-      report = Puppet::Transaction::Report.new("apply")
+      report = Puppet::Transaction::Report.new
 
       @agent.run(:report => report)
       expect(report.host).to eq('node_name_from_fact')
     end
 
     it "should pass the new report to the catalog" do
-      report = Puppet::Transaction::Report.new("apply")
+      report = Puppet::Transaction::Report.new
       Puppet::Transaction::Report.stubs(:new).returns report
       @catalog.expects(:apply).with{|options| options[:report] == report}
 
@@ -142,14 +142,14 @@ describe Puppet::Configurer do
     end
 
     it "should use the provided report if it was passed one" do
-      report = Puppet::Transaction::Report.new("apply")
+      report = Puppet::Transaction::Report.new
       @catalog.expects(:apply).with {|options| options[:report] == report}
 
       @agent.run(:report => report)
     end
 
     it "should set the report as a log destination" do
-      report = Puppet::Transaction::Report.new("apply")
+      report = Puppet::Transaction::Report.new
 
       report.expects(:<<).with(instance_of(Puppet::Util::Log)).at_least_once
 
@@ -199,8 +199,19 @@ describe Puppet::Configurer do
       @agent.run
     end
 
+    it "should create report with passed transaction_uuid and job_id" do
+      @agent = Puppet::Configurer.new(Puppet::Configurer::DownloaderFactory.new, "test_tuuid", "test_jid")
+      @agent.stubs(:init_storage)
+
+      report = Puppet::Transaction::Report.new(nil, "test", "aaaa")
+      Puppet::Transaction::Report.expects(:new).with(anything, anything, 'test_tuuid', 'test_jid').returns(report)
+      @agent.expects(:send_report).with(report)
+
+      @agent.run
+    end
+
     it "should send the report" do
-      report = Puppet::Transaction::Report.new("apply", nil, "test", "aaaa")
+      report = Puppet::Transaction::Report.new(nil, "test", "aaaa")
       Puppet::Transaction::Report.expects(:new).returns(report)
       @agent.expects(:send_report).with(report)
 
@@ -213,7 +224,7 @@ describe Puppet::Configurer do
     it "should send the transaction report even if the catalog could not be retrieved" do
       @agent.expects(:retrieve_catalog).returns nil
 
-      report = Puppet::Transaction::Report.new("apply", nil, "test", "aaaa")
+      report = Puppet::Transaction::Report.new(nil, "test", "aaaa")
       Puppet::Transaction::Report.expects(:new).returns(report)
       @agent.expects(:send_report).with(report)
 
@@ -226,7 +237,7 @@ describe Puppet::Configurer do
     it "should send the transaction report even if there is a failure" do
       @agent.expects(:retrieve_catalog).raises "whatever"
 
-      report = Puppet::Transaction::Report.new("apply", nil, "test", "aaaa")
+      report = Puppet::Transaction::Report.new(nil, "test", "aaaa")
       Puppet::Transaction::Report.expects(:new).returns(report)
       @agent.expects(:send_report).with(report)
 
@@ -237,7 +248,7 @@ describe Puppet::Configurer do
     end
 
     it "should remove the report as a log destination when the run is finished" do
-      report = Puppet::Transaction::Report.new("apply")
+      report = Puppet::Transaction::Report.new
       Puppet::Transaction::Report.expects(:new).returns(report)
 
       @agent.run
@@ -246,7 +257,7 @@ describe Puppet::Configurer do
     end
 
     it "should return the report exit_status as the result of the run" do
-      report = Puppet::Transaction::Report.new("apply")
+      report = Puppet::Transaction::Report.new
       Puppet::Transaction::Report.expects(:new).returns(report)
       report.expects(:exit_status).returns(1234)
 
@@ -254,7 +265,7 @@ describe Puppet::Configurer do
     end
 
     it "should send the transaction report even if the pre-run command fails" do
-      report = Puppet::Transaction::Report.new("apply")
+      report = Puppet::Transaction::Report.new
       Puppet::Transaction::Report.expects(:new).returns(report)
 
       Puppet.settings[:prerun_command] = "/my/command"
@@ -265,7 +276,7 @@ describe Puppet::Configurer do
     end
 
     it "should include the pre-run command failure in the report" do
-      report = Puppet::Transaction::Report.new("apply")
+      report = Puppet::Transaction::Report.new
       Puppet::Transaction::Report.expects(:new).returns(report)
 
       Puppet.settings[:prerun_command] = "/my/command"
@@ -276,7 +287,7 @@ describe Puppet::Configurer do
     end
 
     it "should send the transaction report even if the post-run command fails" do
-      report = Puppet::Transaction::Report.new("apply")
+      report = Puppet::Transaction::Report.new
       Puppet::Transaction::Report.expects(:new).returns(report)
 
       Puppet.settings[:postrun_command] = "/my/command"
@@ -287,7 +298,7 @@ describe Puppet::Configurer do
     end
 
     it "should include the post-run command failure in the report" do
-      report = Puppet::Transaction::Report.new("apply")
+      report = Puppet::Transaction::Report.new
       Puppet::Transaction::Report.expects(:new).returns(report)
 
       Puppet.settings[:postrun_command] = "/my/command"
@@ -308,7 +319,7 @@ describe Puppet::Configurer do
     end
 
     it "should finalize the report" do
-      report = Puppet::Transaction::Report.new("apply")
+      report = Puppet::Transaction::Report.new
       Puppet::Transaction::Report.expects(:new).returns(report)
 
       report.expects(:finalize_report)
@@ -316,7 +327,7 @@ describe Puppet::Configurer do
     end
 
     it "should not apply the catalog if the pre-run command fails" do
-      report = Puppet::Transaction::Report.new("apply")
+      report = Puppet::Transaction::Report.new
       Puppet::Transaction::Report.expects(:new).returns(report)
 
       Puppet.settings[:prerun_command] = "/my/command"
@@ -329,7 +340,7 @@ describe Puppet::Configurer do
     end
 
     it "should apply the catalog, send the report, and return nil if the post-run command fails" do
-      report = Puppet::Transaction::Report.new("apply")
+      report = Puppet::Transaction::Report.new
       Puppet::Transaction::Report.expects(:new).returns(report)
 
       Puppet.settings[:postrun_command] = "/my/command"
@@ -357,7 +368,7 @@ describe Puppet::Configurer do
     end
 
     it "should fix the report if the server specifies a new environment in the catalog" do
-      report = Puppet::Transaction::Report.new("apply", nil, "test", "aaaa")
+      report = Puppet::Transaction::Report.new(nil, "test", "aaaa")
       Puppet::Transaction::Report.expects(:new).returns(report)
       @agent.expects(:send_report).with(report)
 
@@ -375,6 +386,12 @@ describe Puppet::Configurer do
       @agent.run
     end
 
+    it "sends the transaction uuid in a catalog request" do
+      @agent.instance_variable_set(:@job_id, 'aaa')
+      Puppet::Resource::Catalog.indirection.expects(:find).with(anything, has_entries(:job_id => 'aaa'))
+      @agent.run
+    end
+
     it "sets the static_catalog query param to true in a catalog request" do
       Puppet::Resource::Catalog.indirection.expects(:find).with(anything, has_entries(:static_catalog => true))
       @agent.run
@@ -440,7 +457,7 @@ describe Puppet::Configurer do
       @configurer = Puppet::Configurer.new
       Puppet[:lastrunfile] = tmpfile('last_run_file')
 
-      @report = Puppet::Transaction::Report.new("apply")
+      @report = Puppet::Transaction::Report.new
       Puppet[:reports] = "none"
     end
 
@@ -860,20 +877,6 @@ describe Puppet::Configurer do
       @agent.retrieve_catalog({})
       expect(@agent.instance_variable_get(:@cached_catalog_status)).to eq('on_failure')
     end
-
-    it "should not update the cached catalog in noop mode" do
-      Puppet[:noop] = true
-      Puppet::Resource::Catalog.indirection.expects(:find).with(anything, has_entries(:ignore_cache => true, :ignore_cache_save => true)).returns(@catalog)
-
-      @agent.retrieve_catalog({})
-    end
-
-    it "should update the cached catalog when not in noop mode" do
-      Puppet[:noop] = false
-      Puppet::Resource::Catalog.indirection.expects(:find).with(anything, has_entries(:ignore_cache => true, :ignore_cache_save => false)).returns(@catalog)
-
-      @agent.retrieve_catalog({})
-    end
   end
 
   describe "when converting the catalog" do

data/spec/unit/defaults_spec.rb

@@ -42,36 +42,6 @@ describe "Defaults" do
     end
   end
 
-  describe 'cfacter' do
-
-    before :each do
-      Facter.reset
-    end
-
-    it 'should default to false' do
-      expect(Puppet.settings[:cfacter]).to be_falsey
-    end
-
-    it 'should raise an error if cfacter is not installed' do
-      Puppet.features.stubs(:cfacter?).returns false
-      expect { Puppet.settings[:cfacter] = true }.to raise_exception ArgumentError, 'cfacter version 0.2.0 or later is not installed.'
-    end
-
-    it 'should raise an error if facter has already evaluated facts' do
-      Facter[:facterversion]
-      Puppet.features.stubs(:cfacter?).returns true
-      expect { Puppet.settings[:cfacter] = true }.to raise_exception ArgumentError, 'facter has already evaluated facts.'
-    end
-
-    it 'should initialize cfacter when set to true' do
-      Puppet.features.stubs(:cfacter?).returns true
-      CFacter = mock
-      CFacter.stubs(:initialize)
-      Puppet.settings[:cfacter] = true
-    end
-
-  end
-
   describe 'strict' do
     it 'should accept the valid value :off' do
       expect {Puppet.settings[:strict] = 'off'}.to_not raise_exception
@@ -118,18 +88,4 @@ describe "Defaults" do
       Puppet.settings.handlearg("--server", "test_server")
     end
   end
-
-  describe 'basemodulepath' do
-    it 'includes the global and system modules on non-windows', :unless => Puppet::Util::Platform.windows? do
-      expect(
-        Puppet[:basemodulepath]
-      ).to match(%r{.*/code/modules:/opt/puppetlabs/puppet/modules})
-    end
-
-    it 'includes global modules on windows', :if => Puppet::Util::Platform.windows? do
-      expect(
-        Puppet[:basemodulepath]
-      ).to match(%r{.*/code/modules})
-    end
-  end
 end

data/spec/unit/environments_spec.rb

@@ -209,20 +209,6 @@ static_catalogs=false
       end
 
       it "logs a warning, but processes the main settings if there are any extraneous settings" do
-        content << "dog=arf\n"
-        content << "cat=mew\n"
-        loader_from(:filesystem => [envdir, manifestdir, modulepath].flatten,
-                    :directory => envdir) do |loader|
-          expect(loader.get("env1")).to environment(:env1).
-            with_manifest(manifestdir.path).
-            with_modulepath(modulepath.map(&:path)).
-            with_config_version(File.expand_path('/some/script'))
-        end
-
-        expect(@logs.map(&:to_s).join).to match(/Invalid.*at.*\/env1.*unknown setting.*dog, cat/)
-      end
-
-      it "logs a warning, but processes the main settings if there are any ignored sections" do
         content << "dog=arf\n"
         content << "cat=mew\n"
         content << "[ignored]\n"
@@ -235,7 +221,6 @@ static_catalogs=false
             with_config_version(File.expand_path('/some/script'))
         end
 
-        expect(@logs.map(&:to_s).join).to match(/Invalid.*at.*\/env1.*The following sections are being ignored: 'ignored'/)
         expect(@logs.map(&:to_s).join).to match(/Invalid.*at.*\/env1.*unknown setting.*dog, cat/)
       end
 

data/spec/unit/face/config_spec.rb

@@ -139,6 +139,7 @@ basemodulepath = #{File.expand_path("/some/base")}
     end
 
     it "prints the default configured env settings for an env that does not exist" do
+      pending "This case no longer exists because Application will through an error before we even get here because of the non-existent environment"
       Puppet[:environment] = 'doesnotexist'
 
       FS.overlay(
@@ -149,7 +150,7 @@ basemodulepath = #{File.expand_path("/some/base")}
         args = "environmentpath","manifest","modulepath","environment","basemodulepath"
         expect { subject.print(*add_section_option(args, section)) }.to have_printed(<<-OUTPUT)
 environmentpath = #{File.expand_path("/dev/null/environments")}
-manifest = 
+manifest = no_manifest
 modulepath = 
 environment = doesnotexist
 basemodulepath = #{File.expand_path("/some/base")}

data/spec/unit/face/epp_face_spec.rb

@@ -237,15 +237,6 @@ describe Puppet::Face[:epp, :current] do
       expect(eppface.render({ :e => 'trusted is hash: <%= $trusted =~ Hash %>' })).to eql("trusted is hash: true")
     end
 
-    it 'initializes the 4x loader' do
-      expect(eppface.render({ :e => <<-EPP.unindent })).to eql("\nString\n\nInteger\n\nBoolean\n")
-        <% $data = [type('a',generalized), type(2,generalized), type(true)] -%>
-        <% $data.each |$value| { %>
-        <%= $value %>
-        <% } -%>
-      EPP
-    end
-
     it "facts can be added to" do
       expect(eppface.render({
         :facts => {'the_crux' => 'biscuit'},

data/spec/unit/face/module/list_spec.rb

@@ -218,6 +218,66 @@ describe "puppet module list" do
       console_output(:tree => true)
     end
 
+    it 'should not warn about dependent module with pre-release version by default' do
+      PuppetSpec::Modules.create('depender', @modpath1, :metadata => {
+        :version => '1.0.0',
+        :dependencies => [{
+          "version_requirement" => ">= 1.0.0",
+          "name"                => "puppetlabs/dependable"
+        }]
+      })
+      PuppetSpec::Modules.create('dependable', @modpath1, :metadata => { :version => '1.0.0-rc1' })
+
+      expected = <<-OUTPUT.unindent
+      #{@modpath1}
+      ├── puppetlabs-dependable (\e[0;36mv1.0.0-rc1\e[0m)
+      └── puppetlabs-depender (\e[0;36mv1.0.0\e[0m)
+      #{@modpath2} (no modules installed)
+      OUTPUT
+
+      expect(console_output).to eq(expected)
+    end
+
+    it 'should warn about dependent module with pre-release version by if pre-release is less than given pre-release' do
+      PuppetSpec::Modules.create('depender', @modpath1, :metadata => {
+        :version => '1.0.0',
+        :dependencies => [{
+          "version_requirement" => ">= 1.0.0-rc1",
+          "name"                => "puppetlabs/dependable"
+        }]
+      })
+      PuppetSpec::Modules.create('dependable', @modpath1, :metadata => { :version => '1.0.0-rc0' })
+
+      expected = <<-OUTPUT.unindent
+      #{@modpath1}
+      ├── puppetlabs-dependable (\e[0;36mv1.0.0-rc0\e[0m)  \e[0;31minvalid\e[0m
+      └── puppetlabs-depender (\e[0;36mv1.0.0\e[0m)
+      #{@modpath2} (no modules installed)
+      OUTPUT
+
+      expect(console_output).to eq(expected)
+    end
+
+    it 'should warn about dependent module with pre-release version when using strict SemVer' do
+      PuppetSpec::Modules.create('depender', @modpath1, :metadata => {
+        :version => '1.0.0',
+        :dependencies => [{
+          "version_requirement" => ">= 1.0.0",
+          "name"                => "puppetlabs/dependable"
+        }]
+      })
+      PuppetSpec::Modules.create('dependable', @modpath1, :metadata => { :version => '1.0.0-rc1' })
+
+      expected = <<-OUTPUT.unindent
+      #{@modpath1}
+      ├── puppetlabs-dependable (\e[0;36mv1.0.0-rc1\e[0m)  \e[0;31minvalid\e[0m
+      └── puppetlabs-depender (\e[0;36mv1.0.0\e[0m)
+      #{@modpath2} (no modules installed)
+      OUTPUT
+
+      expect(console_output(:strict_semver => true)).to eq(expected)
+    end
+
     it "should warn about out of range dependencies" do
       PuppetSpec::Modules.create('dependable', @modpath1, :metadata => { :version => '0.0.1'})
       PuppetSpec::Modules.create('depender', @modpath1, :metadata => {

data/spec/unit/file_bucket/file_spec.rb

@@ -13,8 +13,8 @@ describe Puppet::FileBucket::File, :uses_checksums => true do
     expect(Puppet::FileBucket::File.default_format).to eq(:binary)
   end
 
-  it "accepts binary" do
-    expect(Puppet::FileBucket::File.supported_formats).to include(:binary)
+  it "only accepts binary" do
+    expect(Puppet::FileBucket::File.supported_formats).to eq([:binary])
   end
 
   describe "making round trips through network formats" do
@@ -28,7 +28,7 @@ describe Puppet::FileBucket::File, :uses_checksums => true do
   end
 
   it "should require contents to be a string" do
-    expect { Puppet::FileBucket::File.new(5) }.to raise_error(ArgumentError, /contents must be a String or Pathname, got a Fixnum$/)
+    expect { Puppet::FileBucket::File.new(5) }.to raise_error(ArgumentError, /contents must be a String or Pathname, got a (?:Fixnum|Integer)$/)
   end
 
   it "should complain about options other than :bucket_path" do