puppet 5.3.3-x86-mingw32 → 5.3.4-x86-mingw32

data/spec/unit/parser/environment_compiler_spec.rb

@@ -590,7 +590,7 @@ EOS
       it "fails if there are non component resources in the site" do
         expect {
         catalog = compile_to_env_catalog(MANIFEST_WITH_ILLEGAL_RESOURCE).to_resource
-        }.to raise_error(/Only application components can appear inside a site - Notify\[fail me\] is not allowed at line 20/)
+        }.to raise_error(/Only application components can appear inside a site - Notify\[fail me\] is not allowed \(line: 20\)/)
       end
     end
 

data/spec/unit/parser/functions/sprintf_spec.rb

@@ -44,4 +44,30 @@ describe "the sprintf function" do
     expect(result).to(eql("<overlong:  027   0XBEEF (foo     )>"))
   end
 
+  it 'does not attempt to mutate its arguments' do
+    args = ['%d', 1].freeze
+    expect { @scope.function_sprintf(args) }.to_not raise_error
+  end
+
+  it 'support named arguments in a hash with string keys' do
+    result = @scope.function_sprintf(["%<foo>d : %<bar>f", {'foo' => 1, 'bar' => 2}])
+    expect(result).to eq("1 : 2.000000")
+  end
+
+  it 'raises a key error if a key is not present' do
+    expect do
+      @scope.function_sprintf(["%<foo>d : %<zanzibar>f", {'foo' => 1, 'bar' => 2}])
+    end.to raise_error(KeyError, /key<zanzibar> not found/)
+  end
+
+  it 'a hash with string keys that is output formats as strings' do
+    result = @scope.function_sprintf(["%s", {'foo' => 1, 'bar' => 2}])
+    expect(result).to eq("{\"foo\"=>1, \"bar\"=>2}")
+  end
+
+  it 'named arguments hash with non string keys are tolerated' do
+    result = @scope.function_sprintf(["%<foo>d : %<bar>f", {'foo' => 1, 'bar' => 2, 1 => 2, [1] => 2, false => true, {} => {}}])
+    expect(result).to eq("1 : 2.000000")
+  end
+
 end

data/spec/unit/parser/resource/param_spec.rb

@@ -26,7 +26,7 @@ describe Puppet::Parser::Resource::Param do
     it "includes file/line context in errors" do
       expect {
         Puppet::Parser::Resource::Param.new(:file => 'foo.pp', :line => 42)
-      }.to raise_error(Puppet::Error, /foo.pp:42/)
+      }.to raise_error(Puppet::Error, /\(file: foo.pp, line: 42\)/)
     end
   end
 end

data/spec/unit/pops/evaluator/evaluating_parser_spec.rb

@@ -1017,7 +1017,7 @@ describe 'Puppet::Pops::Evaluator::EvaluatorImpl' do
       end
 
     it "provides location information on error in unparenthesized call logic" do
-    expect{parser.evaluate_string(scope, "include non_existing_class", __FILE__)}.to raise_error(Puppet::ParseError, /:1:1/)
+    expect{parser.evaluate_string(scope, "include non_existing_class", __FILE__)}.to raise_error(Puppet::ParseError, /line: 1, column: 1/)
     end
 
     it 'defaults can be given in a lambda and used only when arg is missing' do
@@ -1204,7 +1204,7 @@ describe 'Puppet::Pops::Evaluator::EvaluatorImpl' do
     end
 
     it "a lex error should be raised for '$foo::::bar'" do
-      expect { parser.evaluate_string(scope, "$foo::::bar") }.to raise_error(Puppet::ParseErrorWithIssue, /Illegal fully qualified name at line 1:7/)
+      expect { parser.evaluate_string(scope, "$foo::::bar") }.to raise_error(Puppet::ParseErrorWithIssue, /Illegal fully qualified name \(line: 1, column: 7\)/)
     end
 
     { '$a = $0'   => nil,
@@ -1394,7 +1394,7 @@ describe 'Puppet::Pops::Evaluator::EvaluatorImpl' do
       source = "\nimport foo"
       # Error references position 5 at the opening '{'
       # Set file to nil to make it easier to match with line number (no file name in output)
-      expect { parser.evaluate_string(scope, source) }.to raise_error(/'import' has been discontinued.*line 2:1/)
+      expect { parser.evaluate_string(scope, source) }.to raise_error(/'import' has been discontinued.* \(line: 2, column: 1\)/)
     end
   end
 
@@ -1404,15 +1404,15 @@ describe 'Puppet::Pops::Evaluator::EvaluatorImpl' do
       # Error references position 5 at the opening '{'
       # Set file to nil to make it easier to match with line number (no file name in output)
       expect { parser.evaluate_string(scope, source) }.to raise_error(
-        /Illegal Resource Type expression, expected result to be a type name, or untitled Resource.*line 1:2/)
+        /Illegal Resource Type expression, expected result to be a type name, or untitled Resource.* \(line: 1, column: 2\)/)
     end
 
     it 'for non r-value producing <| |>' do
-      expect { parser.parse_string("$a = File <| |>", nil) }.to raise_error(/A Virtual Query does not produce a value at line 1:6/)
+      expect { parser.parse_string("$a = File <| |>", nil) }.to raise_error(/A Virtual Query does not produce a value \(line: 1, column: 6\)/)
     end
 
     it 'for non r-value producing <<| |>>' do
-      expect { parser.parse_string("$a = File <<| |>>", nil) }.to raise_error(/An Exported Query does not produce a value at line 1:6/)
+      expect { parser.parse_string("$a = File <<| |>>", nil) }.to raise_error(/An Exported Query does not produce a value \(line: 1, column: 6\)/)
     end
 
     it 'for non r-value producing define' do
@@ -1433,7 +1433,7 @@ describe 'Puppet::Pops::Evaluator::EvaluatorImpl' do
       yyy
       SOURCE
       # first char after opening " reported as being in error.
-      expect { parser.parse_string(source) }.to raise_error(/Unclosed quote after '"' followed by 'xx\\nyy\.\.\.' at line 1:7/)
+      expect { parser.parse_string(source) }.to raise_error(/Unclosed quote after '"' followed by 'xx\\nyy\.\.\.' \(line: 1, column: 7\)/)
     end
 
     it 'for multiple errors with a summary exception' do
@@ -1445,7 +1445,7 @@ describe 'Puppet::Pops::Evaluator::EvaluatorImpl' do
     it 'for a bad hostname' do
       expect {
         parser.parse_string("node 'macbook+owned+by+name' { }", nil)
-      }.to raise_error(/The hostname 'macbook\+owned\+by\+name' contains illegal characters.*at line 1:6/)
+      }.to raise_error(/The hostname 'macbook\+owned\+by\+name' contains illegal characters.* \(line: 1, column: 6\)/)
     end
 
     it 'for a hostname with interpolation' do
@@ -1455,7 +1455,7 @@ describe 'Puppet::Pops::Evaluator::EvaluatorImpl' do
       SOURCE
       expect {
         parser.parse_string(source, nil)
-      }.to raise_error(/An interpolated expression is not allowed in a hostname of a node at line 2:23/)
+      }.to raise_error(/An interpolated expression is not allowed in a hostname of a node \(line: 2, column: 23\)/)
     end
 
   end

data/spec/unit/pops/loaders/static_loader_spec.rb

@@ -24,7 +24,7 @@ describe 'the static loader' do
     let(:loader) { loader = Puppet::Pops::Loader::StaticLoader.new() }
 
     %w{
-      Auegas
+      Augeas
       Component
       Computer
       Cron

data/spec/unit/pops/parser/parse_containers_spec.rb

@@ -88,7 +88,7 @@ describe "egrammar parsing containers" do
       it "class 'foo' {} # a string as class name" do
         # A common error is to put quotes around the class name, the parser should provide the error message at the right location
         # See PUP-7471
-        expect { parse("class 'foo' {}") }.to raise_error(/A quoted string is not valid as a name here at line 1:7/)
+        expect { parse("class 'foo' {}") }.to raise_error(/A quoted string is not valid as a name here \(line: 1, column: 7\)/)
       end
 
 

data/spec/unit/pops/types/type_calculator_spec.rb

@@ -124,6 +124,10 @@ describe 'The type calculator' do
     TypeFactory.object(hash)
   end
 
+  def iterable_t(t = nil)
+    TypeFactory.iterable(t)
+  end
+
   def types
     Types
   end
@@ -971,6 +975,11 @@ describe 'The type calculator' do
         types_to_test.each {|t2| expect(t).not_to be_assignable_to(t2::DEFAULT) }
       end
 
+      it 'Numeric does not consider ruby Rational to be an instance' do
+        t = PNumericType::DEFAULT
+        expect(t).not_to be_instance(Rational(2,3))
+      end
+
       it 'Numeric is not assignable to any disjunct type' do
         tested_types = all_types - [
           PAnyType,
@@ -1737,6 +1746,13 @@ describe 'The type calculator' do
         t2 = parser.parse('Type[PositiveIntegerType]', scope)
         expect(calculator.assignable?(t2, t1)).to be_truthy
       end
+
+      it 'An alias for a Type that describes an Iterable instance is assignable to Iterable' do
+        t = type_alias_t('MyType', 'Enum[a,b]').resolve(nil)
+
+        # True because String is iterable and an instance of Enum is a String
+        expect(calculator.assignable?(iterable_t, t)).to be_truthy
+      end
     end
   end
 
@@ -2028,6 +2044,11 @@ describe 'The type calculator' do
         expect(calculator.instance?(t, 15)).to be_truthy
       end
 
+      it 'should consider t an instance of Iterable when aliased type is Iterable' do
+        t = type_alias_t('Alias', 'Enum[a, b]').resolve(nil)
+        expect(calculator.instance?(iterable_t, t)).to be_truthy
+      end
+
       it 'should consider x an instance of the aliased type that uses self recursion' do
         t = type_alias_t('Tree', 'Hash[String,Variant[String,Tree]]')
         loader = Object.new
@@ -2101,6 +2122,20 @@ describe 'The type calculator' do
       expect(t.key_type.class).to eq(PAnyType)
       expect(t.value_type.class).to eq(PAnyType)
     end
+
+    it 'type should yield \'PRuntimeType[ruby,Rational]\' for Rational' do
+      t = calculator.type(Rational)
+      expect(t.class).to eq(PRuntimeType)
+      expect(t.runtime).to eq(:ruby)
+      expect(t.runtime_type_name).to eq('Rational')
+    end
+
+    it 'infer should yield \'PRuntimeType[ruby,Rational]\' for Rational instance' do
+      t = calculator.infer(Rational(2, 3))
+      expect(t.class).to eq(PRuntimeType)
+      expect(t.runtime).to eq(:ruby)
+      expect(t.runtime_type_name).to eq('Rational')
+    end
   end
 
   context 'when processing meta type' do
@@ -2221,6 +2256,11 @@ describe 'The type calculator' do
         expect(calculator.iterable(calculator.type(t))).to eq(nil)
       end
     end
+
+    it 'should produce an iterable for a type alias of an Iterable type' do
+      t = PTypeAliasType.new('MyAlias', nil, PIntegerType.new(1, 10))
+      expect(calculator.iterable(t).respond_to?(:each)).to eq(true)
+    end
   end
 
   context 'when dealing with different types of inference' do

data/spec/unit/pops/types/type_mismatch_describer_spec.rb

@@ -168,6 +168,15 @@ describe 'the type mismatch describer' do
       /parameter 'arg' expects a match for Enum\['a', 'b'\], got Sensitive/))
   end
 
+  it "will report the parameter of Type[<type alias>] using the alias name" do
+    code = <<-CODE
+      type Custom = String[1]
+      Custom.each |$x| { notice($x) }
+    CODE
+    expect { eval_and_collect_notices(code) }.to(raise_error(Puppet::Error,
+      /expects an Iterable value, got Type\[Custom\]/))
+  end
+
   context 'when reporting a mismatch between' do
     let(:parser) { TypeParser.singleton }
     let(:subject) { TypeMismatchDescriber.singleton }

data/spec/unit/provider/selmodule_spec.rb

@@ -69,5 +69,11 @@ describe provider_class do
       @provider.expects(:execpipe).with("/usr/sbin/semodule --list").yields StringIO.new("bar\t1.2.3\nfoo\t4.4.4\nbang\t1.0.0\n")
       expect(@provider.selmodversion_loaded).to eq("4.4.4")
     end
+
+    it 'should return raise an exception when running selmodule raises an exception' do
+      @provider.expects(:command).with(:semodule).returns "/usr/sbin/semodule"
+      @provider.expects(:execpipe).with("/usr/sbin/semodule --list").yields("this is\nan error").raises(Puppet::ExecutionFailure, 'it failed')
+      expect {@provider.selmodversion_loaded}.to raise_error(Puppet::ExecutionFailure, /Could not list policy modules: ".*" failed with "this is an error"/)
+    end
   end
 end

data/spec/unit/provider/service/init_spec.rb

@@ -240,7 +240,7 @@ describe Puppet::Type.type(:service).provider(:init) do
     describe "when starting a service on Solaris" do
       it "should use ctrun" do
         Facter.stubs(:value).with(:osfamily).returns 'Solaris'
-        provider.expects(:execute).with('/usr/bin/ctrun -l none /service/path/myservice start', {:failonfail => true, :override_locale => false, :squelch => false, :combine => true}).returns("")
+        provider.expects(:execute).with('/usr/bin/ctrun -l child /service/path/myservice start', {:failonfail => true, :override_locale => false, :squelch => false, :combine => true}).returns("")
         $CHILD_STATUS.stubs(:exitstatus).returns(0)
         provider.start
       end

data/spec/unit/provider/service/smf_spec.rb

@@ -166,12 +166,14 @@ describe provider_class, :if => Puppet.features.posix? do
 
   describe "when stopping" do
     it "should execute external command 'svcadm disable /system/myservice'" do
+      @provider.stubs(:status).returns :running
       @provider.expects(:texecute).with(:stop, ["/usr/sbin/svcadm", :disable, '-s', "/system/myservice"], true)
       @provider.expects(:wait).with('offline', 'disabled', 'uninitialized')
       @provider.stop
     end
 
     it "should error if timeout occurs while stopping the service" do
+      @provider.stubs(:status).returns :running
       @provider.expects(:texecute).with(:stop, ["/usr/sbin/svcadm", :disable, '-s', "/system/myservice"], true)
       Timeout.expects(:timeout).with(60).raises(Timeout::Error)
       expect { @provider.stop }.to raise_error Puppet::Error, ('Timed out waiting for /system/myservice to transition states')

data/spec/unit/provider/service/systemd_spec.rb

@@ -58,6 +58,20 @@ describe Puppet::Type.type(:service).provider(:systemd) do
     end
   end
 
+  it "should be the default provider on Amazon Linux 2.0" do
+    Facter.stubs(:value).with(:osfamily).returns(:redhat)
+    Facter.stubs(:value).with(:operatingsystem).returns(:amazon)
+    Facter.stubs(:value).with(:operatingsystemmajrelease).returns("2")
+    expect(described_class).to be_default
+  end
+
+  it "should not be the default provider on Amazon Linux 2017.09" do
+    Facter.stubs(:value).with(:osfamily).returns(:redhat)
+    Facter.stubs(:value).with(:operatingsystem).returns(:amazon)
+    Facter.stubs(:value).with(:operatingsystemmajrelease).returns("2017")
+    expect(described_class).not_to be_default
+  end
+
   it "should be the default provider on cumulus3" do
     Facter.stubs(:value).with(:osfamily).returns(:debian)
     Facter.stubs(:value).with(:operatingsystem).returns('CumulusLinux')

data/spec/unit/resource/catalog_spec.rb

@@ -401,9 +401,9 @@ describe Puppet::Resource::Catalog, "when compiling" do
           expect(error).to be_a Puppet::Resource::Catalog::DuplicateResourceError
 
           expect(error.message).to match %r[Duplicate declaration: Notify\[duplicate-title\] is already declared]
-          expect(error.message).to match %r[in file /path/to/orig/file:42]
+          expect(error.message).to match %r[at \(file: /path/to/orig/file, line: 42\)]
           expect(error.message).to match %r[cannot redeclare]
-          expect(error.message).to match %r[at /path/to/dupe/file:314]
+          expect(error.message).to match %r[\(file: /path/to/dupe/file, line: 314\)]
         }
       end
     end
@@ -658,6 +658,16 @@ describe Puppet::Resource::Catalog, "when compiling" do
       @catalog.apply(:ignoreschedules => true)
     end
 
+    it "should detect transaction failure and report it" do
+      @transaction.stubs(:evaluate).raises(RuntimeError, 'transaction failed.')
+      report = Puppet::Transaction::Report.new('apply')
+
+      expect { @catalog.apply(:report => report) }.to raise_error(RuntimeError)
+      report.finalize_report
+
+      expect(report.status).to eq('failed')
+    end
+
     describe "host catalogs" do
 
       # super() doesn't work in the setup method for some reason

data/spec/unit/settings/config_file_spec.rb

@@ -123,7 +123,7 @@ badline
 
     expect { config.parse_file(filename, text, [:legal]) }.
       to raise_error Puppet::Error,
-        /Illegal section 'legal' in config file #{filename} at line 1/
+        /Illegal section 'legal' in config file at \(file: #{filename}, line: 1\)/
   end
 
   it "transforms values with the given function" do

data/spec/unit/transaction/persistence_spec.rb

@@ -175,4 +175,46 @@ describe Puppet::Transaction::Persistence do
       expect(persistence.get_system_value(resource, property)).to eq(value)
     end
   end
+
+  describe "when checking if persistence is enabled" do
+    let(:mock_catalog) do
+      mock
+    end
+
+    let (:persistence) do
+      Puppet::Transaction::Persistence.new
+    end
+
+    before :all do
+      @preferred_run_mode = Puppet.settings.preferred_run_mode
+    end
+
+    after :all do
+      Puppet.settings.preferred_run_mode = @preferred_run_mode
+    end
+
+    it "should not be enabled when not running in agent mode" do
+      Puppet.settings.preferred_run_mode = :user
+      mock_catalog.stubs(:host_config?).returns(true)
+      expect(persistence.enabled?(mock_catalog)).to be false
+    end
+
+    it "should not be enabled when the catalog is not the host catalog" do
+      Puppet.settings.preferred_run_mode = :agent
+      mock_catalog.stubs(:host_config?).returns(false)
+      expect(persistence.enabled?(mock_catalog)).to be false
+    end
+
+    it "should not be enabled outside of agent mode and the catalog is not the host catalog" do
+      Puppet.settings.preferred_run_mode = :user
+      mock_catalog.stubs(:host_config?).returns(false)
+      expect(persistence.enabled?(mock_catalog)).to be false
+    end
+
+    it "should be enabled in agent mode and when the catalog is the host catalog" do
+      Puppet.settings.preferred_run_mode = :agent
+      mock_catalog.stubs(:host_config?).returns(true)
+      expect(persistence.enabled?(mock_catalog)).to be true
+    end
+  end
 end

data/spec/unit/transaction/report_spec.rb

@@ -36,10 +36,6 @@ describe Puppet::Transaction::Report do
     expect(Puppet::Transaction::Report.new("some configuration version", "some environment", "some transaction uuid").transaction_uuid).to eq("some transaction uuid")
   end
 
-  it "should take a 'transaction_uuid' as an argument" do
-    expect(Puppet::Transaction::Report.new("some configuration version", "some environment", "some transaction uuid").transaction_uuid).to eq("some transaction uuid")
-  end
-
   it "should take a 'job_id' as an argument" do
     expect(Puppet::Transaction::Report.new('cv', 'env', 'tid', 'some job id').job_id).to eq('some job id')
   end
@@ -262,6 +258,19 @@ describe Puppet::Transaction::Report do
       end
     end
 
+    it "should be unchanged if there are no other failures or changes and the transaction completed" do
+      @report.transaction_completed = true
+      @report.finalize_report
+
+      expect(@report.status).to eq("unchanged")
+    end
+
+    it "should be failed if there are no other failures or changes and the transaction did not complete" do
+      @report.finalize_report
+
+      expect(@report.status).to eq("failed")
+    end
+
     [:time, :resources, :changes, :events].each do |type|
       it "should add #{type} metrics" do
         @report.finalize_report
@@ -293,6 +302,7 @@ describe Puppet::Transaction::Report do
 
       it "should mark the report as 'failed' if there are failing resources" do
         add_statuses(1) { |status| status.failed = true }
+        @report.transaction_completed = true
         @report.finalize_report
         expect(@report.status).to eq('failed')
       end
@@ -305,6 +315,7 @@ describe Puppet::Transaction::Report do
 
       it "should mark the report as 'failed' if resources_failed_to_generate" do
         @report.resources_failed_to_generate = true
+        @report.transaction_completed = true
         @report.finalize_report
         expect(@report.status).to eq('failed')
       end
@@ -313,12 +324,14 @@ describe Puppet::Transaction::Report do
     describe "for changes" do
       it "should provide the number of changes from the resource statuses and mark the report as 'changed'" do
         add_statuses(3) { |status| 3.times { status << Puppet::Transaction::Event.new(:status => 'success') } }
+        @report.transaction_completed = true
         @report.finalize_report
         expect(metric(:changes, "total")).to eq(9)
         expect(@report.status).to eq('changed')
       end
 
       it "should provide a total even if there are no changes, and mark the report as 'unchanged'" do
+        @report.transaction_completed = true
         @report.finalize_report
         expect(metric(:changes, "total")).to eq(0)
         expect(@report.status).to eq('unchanged')
@@ -638,6 +651,7 @@ describe Puppet::Transaction::Report do
     report.cached_catalog_status = "not_used"
     report.master_used = "test:000"
     report.add_resource_status(status)
+    report.transaction_completed = true
     report.finalize_report
     report
   end
@@ -655,6 +669,7 @@ describe Puppet::Transaction::Report do
     report.cached_catalog_status = "not_used"
     report.master_used = "test:000"
     report.add_resource_status(status)
+    report.transaction_completed = true
     report.finalize_report
     report
   end