puppet 6.2.0-x86-mingw32 → 6.3.0-x86-mingw32

data/spec/unit/functions/partition_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+require 'puppet_spec/compiler'
+require 'matchers/resource'
+
+describe 'the partition function' do
+  include PuppetSpec::Compiler
+  include Matchers::Resource
+
+  context 'for an array' do
+    it 'partitions by item' do
+      manifest = "notify { String(partition(['', b, ab]) |$s| { $s.empty }): }"
+      expect(compile_to_catalog(manifest)).to have_resource("Notify[[[''], ['b', 'ab']]]")
+    end
+
+    it 'partitions by index, item' do
+      manifest = "notify { String(partition(['', b, ab]) |$i, $s| { $i == 2 or $s.empty }): }"
+      expect(compile_to_catalog(manifest)).to have_resource("Notify[[['', 'ab'], ['b']]]")
+    end
+  end
+
+  context 'for a hash' do
+    it 'partitions by key-value pair' do
+      manifest = "notify { String(partition(a => [1, 2], b => []) |$kv| { $kv[1].empty }): }"
+      expect(compile_to_catalog(manifest)).to have_resource("Notify[[[['b', []]], [['a', [1, 2]]]]]")
+    end
+
+    it 'partitions by key, value' do
+      manifest = "notify { String(partition(a => [1, 2], b => []) |$k, $v| { $v.empty }): }"
+      expect(compile_to_catalog(manifest)).to have_resource("Notify[[[['b', []]], [['a', [1, 2]]]]]")
+    end
+  end
+
+  context 'for a string' do
+    it 'fails' do
+      manifest = "notify { String(partition('something') |$s| { $s.empty }): }"
+      expect { compile_to_catalog(manifest) }.to raise_error(Puppet::PreformattedError)
+    end
+  end
+end

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

@@ -421,6 +421,11 @@ describe 'loaders' do
       expect(function.call(scope, 'passed in scope')).to eql("usee::callee_ws() got 'passed in scope'")
     end
 
+    it 'calls can be made to a non core function via the call() function' do
+      call_function = loader.load_typed(typed_name(:function, 'call')).value
+      expect(call_function.call(scope, 'user::puppetcaller4')).to eql("usee::callee() got 'first' - usee::callee() got 'second'")
+    end
+
   end
 
   context 'when a 3x load takes place' do

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

@@ -41,4 +41,49 @@ describe Puppet::Pops::Parser::Locator do
     expect(model.body.locator.line_for_offset(2)).to eq(:third_value)
   end
 
+  it 'A heredoc without margin and interpolated expression location has offset and length relative the source' do
+    parser = Puppet::Pops::Parser::Parser.new()
+    src = <<-CODE
+    # line one
+    # line two
+    @("END"/L)
+        Line four\\
+        Line five ${1 +
+        1}
+    END
+    CODE
+
+    model = parser.parse_string(src).model
+    interpolated_expr = model.body.text_expr.segments[1].expr
+    expect(interpolated_expr.left_expr.offset).to eq(84)
+    expect(interpolated_expr.left_expr.length).to eq(1)
+    expect(interpolated_expr.right_expr.offset).to eq(96)
+    expect(interpolated_expr.right_expr.length).to eq(1)
+    expect(interpolated_expr.offset).to eq(86) # the + sign
+    expect(interpolated_expr.length).to eq(1) # the + sign
+    expect(interpolated_expr.locator.extract_tree_text(interpolated_expr)).to eq("1 +\n        1")
+  end
+
+  it 'A heredoc with margin and interpolated expression location has offset and length relative the source' do
+    parser = Puppet::Pops::Parser::Parser.new()
+    src = <<-CODE
+    # line one
+    # line two
+    @("END"/L)
+        Line four\\
+        Line five ${1 +
+        1}
+    |- END
+    CODE
+
+    model = parser.parse_string(src).model
+    interpolated_expr = model.body.text_expr.segments[1].expr
+    expect(interpolated_expr.left_expr.offset).to eq(84)
+    expect(interpolated_expr.left_expr.length).to eq(1)
+    expect(interpolated_expr.right_expr.offset).to eq(96)
+    expect(interpolated_expr.right_expr.length).to eq(1)
+    expect(interpolated_expr.offset).to eq(86) # the + sign
+    expect(interpolated_expr.length).to eq(1) # the + sign
+    expect(interpolated_expr.locator.extract_tree_text(interpolated_expr)).to eq("1 +\n        1")
+  end
 end

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

@@ -10,7 +10,7 @@ describe "egrammar parsing heredoc" do
   it "parses plain heredoc" do
     expect(dump(parse("@(END)\nThis is\nheredoc text\nEND\n"))).to eq([
       "(@()",
-      "  (sublocated 'This is\nheredoc text\n')",
+      "  'This is\nheredoc text\n'",
       ")"
     ].join("\n"))
   end
@@ -25,7 +25,7 @@ describe "egrammar parsing heredoc" do
     ].join("\n")
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (sublocated 'This is\nheredoc text\n')",
+      "  'This is\nheredoc text\n'",
       ")"
     ].join("\n"))
   end
@@ -40,7 +40,7 @@ describe "egrammar parsing heredoc" do
     ].join("\n")
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (sublocated 'This is\nheredoc text')",
+      "  'This is\nheredoc text'",
       ")"
     ].join("\n"))
   end
@@ -53,7 +53,7 @@ describe "egrammar parsing heredoc" do
     CODE
     expect(dump(parse(src))).to eq([
       "(@(syntax)",
-      "  (sublocated 'Tex\tt\\n')",
+      "  'Tex\tt\\n'",
       ")"
     ].join("\n"))
   end
@@ -66,7 +66,7 @@ describe "egrammar parsing heredoc" do
     CODE
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (sublocated (cat 'Hello ' (str $name)))",
+      "  (cat 'Hello ' (str $name))",
       ")"
     ].join("\n"))
   end
@@ -79,7 +79,7 @@ describe "egrammar parsing heredoc" do
     CODE
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (sublocated (cat 'Hello \\' (str $name)))",
+      "  (cat 'Hello \\' (str $name))",
       ")"
     ].join("\n"))
   end
@@ -92,7 +92,7 @@ describe "egrammar parsing heredoc" do
     CODE
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (sublocated (cat 'Hello \\' (str $name)))",
+      "  (cat 'Hello \\' (str $name))",
       ")"
     ].join("\n"))
   end
@@ -107,7 +107,7 @@ describe "egrammar parsing heredoc" do
     parse(src)
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (sublocated 'First Line Second Line')",
+      "  'First Line Second Line'",
       ")"
     ].join("\n"))
   end
@@ -122,7 +122,7 @@ describe "egrammar parsing heredoc" do
     parse(src)
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (sublocated ' First Line  Second Line')",
+      "  ' First Line  Second Line'",
       ")"
     ].join("\n"))
   end
@@ -135,12 +135,12 @@ describe "egrammar parsing heredoc" do
     CODE
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (sublocated (cat 'Hello ' (str $name) '$%a'))",
+      "  (cat 'Hello ' (str $name) '$%a')",
       ")"
     ].join("\n"))
   end
 
-  it "parses interpolated [] expression by looking at the correct preceding char for space" do
+  it "parses interpolated [] expression by looking at the correct preceding char for space when there is no heredoc margin" do
     # NOTE: Important not to use the left margin feature here
     src = <<-CODE
 $xxxxxxx = @("END")
@@ -150,12 +150,108 @@ END
 CODE
     expect(dump(parse(src))).to eq([
       "(= $xxxxxxx (@()",
-      "  (sublocated (cat (str (slice (slice $facts 'os') 'family')) '",
+      "  (cat (str (slice (slice $facts 'os') 'family')) '",
       "XXXXXXX XXX",
-      "'))",
+      "')",
       "))"].join("\n"))
   end
 
+  it "parses interpolated [] expression by looking at the correct preceding char for space when there is a heredoc margin" do
+    # NOTE: Important not to use the left margin feature here - the problem in PUP 9303 is triggered by lines and text before
+    # an interpolation containing []. 
+    src = <<-CODE
+# comment
+# comment
+$xxxxxxx = @("END")
+    1
+    2
+    3
+    4
+    5
+    YYYYY${facts['fqdn']}
+    XXXXXXX XXX
+    | END
+CODE
+    expect(dump(parse(src))).to eq([
+      "(= $xxxxxxx (@()",
+      "  (cat '1", "2", "3", "4", "5",
+      "YYYYY' (str (slice $facts 'fqdn')) '",
+      "XXXXXXX XXX",
+      "')",
+      "))"].join("\n"))
+  end
+
+  it "correctly reports an error location in a nested heredoc with margin" do
+    # NOTE: Important not to use the left margin feature here - the problem in PUP 9303 is triggered by lines and text before
+    # an interpolation containing []. 
+    src = <<-CODE
+# comment
+# comment
+$xxxxxxx = @("END")
+  1
+  2
+  3
+  4
+  5
+  YYYYY${facts]}
+  XXXXXXX XXX
+  | END
+CODE
+    expect{parse(src)}.to raise_error(/Syntax error at '\]' \(line: 9, column: 15\)/)
+  end
+
+  it "correctly reports an error location in a heredoc with line endings escaped" do
+    # DO NOT CHANGE INDENTATION OF THIS HEREDOC
+    src = <<-CODE
+    # line one
+    # line two
+    @("END"/L)
+    First Line\\
+    Second Line ${facts]}
+    |- END
+    CODE
+    expect{parse(src)}.to raise_error(/Syntax error at '\]' \(line: 5, column: 24\)/)
+  end
+
+  it "correctly reports an error location in a heredoc with line endings escaped when there is text in the margin" do
+    # DO NOT CHANGE INDENTATION OR SPACING OF THIS HEREDOC
+    src = <<-CODE
+    # line one
+    # line two
+    @("END"/L)
+    First Line\\
+    Second Line
+  x Third Line ${facts]}
+    |- END
+    # line 8
+    # line 9
+    CODE
+    expect{parse(src)}.to raise_error(/Syntax error at '\]' \(line: 6, column: 23\)/)
+  end
+
+  it "correctly reports an error location in a heredoc with line endings escaped when there is text in the margin" do
+    # DO NOT CHANGE INDENTATION OR SPACING OF THIS HEREDOC
+    src = <<-CODE
+    @(END)
+AAA
+ BBB
+  CCC
+   DDD
+    EEE
+     FFF
+    |- END
+    CODE
+    expect(dump(parse(src))).to eq([
+      "(@()",
+      "  'AAA", # no left space trimmed
+      " BBB",
+      "  CCC",
+      "   DDD",
+      "EEE", # left space trimmed
+      " FFF'", # indented one because it is one in from margin marker
+      ")"].join("\n"))
+  end
+
   it 'parses multiple heredocs on the same line' do
     src = <<-CODE
     notice({ @(foo) => @(bar) })
@@ -168,9 +264,9 @@ CODE
     expect(dump(parse(src))).to eq([
       '(block',
       '  (invoke notice ({} ((@()',
-      '    (sublocated \'    hello\')',
+      '    \'    hello\'',
       '  ) (@()',
-      '    (sublocated \'    world\')',
+      '    \'    world\'',
       '  ))))',
       '  (invoke notice \'!\')',
       ')'

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

@@ -244,6 +244,15 @@ describe 'the type mismatch describer' do
     expect { eval_and_collect_notices(code) }.to(raise_error(Puppet::Error,
       /Class\[Test\]: parameter 'opts' expects size to be 1, got 0/))
   end
+
+  it "treats Optional as Optional[Any]" do
+    code = <<-PUPPET
+      class test(Optional $var=undef) {}
+      class { 'test': var => 'hello' }
+    PUPPET
+    expect { eval_and_collect_notices(code) }.not_to raise_error
+  end
+
 end
 end
 end

data/spec/unit/provider/group/windows_adsi_spec.rb

@@ -251,7 +251,13 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet::Util:
         'user3',
       ]
 
-      expect(provider.members).to match_array([user1.sid, user2.sid, user3.sid])
+      expected_member_sids = [user1.sid, user2.sid, user3.sid]
+      expected_members = ['user1', 'user2', 'user3']
+      provider.stubs(:members_to_s)
+        .with(expected_member_sids)
+        .returns(expected_members.join(','))
+
+      expect(provider.members).to match_array(expected_members)
     end
 
     it "should be able to set group members" do

data/spec/unit/transaction/resource_harness_spec.rb

@@ -601,4 +601,30 @@ describe Puppet::Transaction::ResourceHarness do
     Puppet::Util::Storage.expects(:cache).with(@resource).returns data
     expect(@harness.cached(@resource, :foo)).to eq("other")
   end
+
+  describe "successful event message" do
+    let(:test_file) do
+      tmpfile('foo').tap do |path|
+        File.open(path, 'w') { |fh| fh.write("old contents") }
+      end
+    end
+
+    let(:resource) do
+      Puppet::Type.type(:file).new(:path => test_file, :backup => false, :content => "hello world")
+    end
+
+    it "contains (corrective) when corrective change" do
+      Puppet::Transaction::Event.any_instance.stubs(:corrective_change).returns(true)
+      status = @harness.evaluate(resource)
+      sync_event = status.events[0]
+      expect(sync_event.message).to match(/content changed '{md5}[0-9a-f]+' to '{md5}[0-9a-f]+' \(corrective\)/)
+    end
+
+    it "contains no modifier when intentional change" do
+      Puppet::Transaction::Event.any_instance.stubs(:corrective_change).returns(false)
+      status = @harness.evaluate(resource)
+      sync_event = status.events[0]
+      expect(sync_event.message).to match(/content changed '{md5}[0-9a-f]+' to '{md5}[0-9a-f]+'$/)
+    end
+  end
 end

data/spec/unit/util/execution_spec.rb

@@ -158,7 +158,6 @@ describe Puppet::Util::Execution, if: !Puppet::Util::Platform.jruby? do
       context 'cwd option' do
         let(:cwd) { 'cwd' }
         it "should execute the command in the specified working directory" do
-          Dir.expects(:chdir).with(cwd).yields
           Process.expects(:create).with(
             :command_line => "test command",
             :startup_info => {
@@ -166,7 +165,8 @@ describe Puppet::Util::Execution, if: !Puppet::Util::Platform.jruby? do
               :stdout => @stdout,
               :stderr => @stderr
             },
-            :close_handles => false
+            :close_handles => false,
+            :cwd => cwd
           )
 
           call_exec_windows('test command', { :cwd => cwd }, @stdin, @stdout, @stderr)

data/spec/unit/util/log_spec.rb

@@ -88,6 +88,21 @@ describe Puppet::Util::Log do
     expect(logs.last.source).to eq(utf_8_msg)
   end
 
+  require 'puppet/util/log/destinations'
+
+  it "raises an error when it has no successful logging destinations" do
+    # spec_helper.rb redirects log output away from the console,
+    # so we have to stop that here, or else the logic we are testing
+    # will not be reached.
+    Puppet::Util::Log.stubs(:destinations).returns({})
+
+    our_exception = Puppet::DevError.new("test exception")
+    Puppet::FileSystem.expects(:dir).raises(our_exception)
+    bad_file = tmpfile("bad_file")
+
+    expect { Puppet::Util::Log.newdestination(bad_file) }.to raise_error(Puppet::DevError)
+  end
+
   describe ".setup_default" do
     it "should default to :syslog" do
       Puppet.features.stubs(:syslog?).returns(true)

data/spec/unit/util/pidlock_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 require 'puppet/util/pidlock'
 
-describe Puppet::Util::Pidlock do
+describe Puppet::Util::Pidlock, if: !Puppet::Util::Platform.jruby? do
   require 'puppet_spec/files'
   include PuppetSpec::Files
 
@@ -23,6 +23,11 @@ describe Puppet::Util::Pidlock do
 
     it "should become locked" do
       @lock.lock
+      if Puppet::Util::Platform.windows?
+        Puppet::Util::Windows::Process.stubs(:get_process_image_name_by_pid).with(@lock.lock_pid).returns('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
+      else
+        Puppet::Util::Execution.stubs(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'comm=']).returns('puppet')
+      end
       expect(@lock).to be_locked
     end
 
@@ -101,6 +106,11 @@ describe Puppet::Util::Pidlock do
   describe "#locked?" do
     it "should return true if locked" do
       @lock.lock
+      if Puppet::Util::Platform.windows?
+        Puppet::Util::Windows::Process.stubs(:get_process_image_name_by_pid).with(@lock.lock_pid).returns('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
+      else
+        Puppet::Util::Execution.stubs(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'comm=']).returns('puppet')
+      end
       expect(@lock).to be_locked
     end
 
@@ -146,6 +156,11 @@ describe Puppet::Util::Pidlock do
       end
 
       it "should replace with new locks" do
+        if Puppet::Util::Platform.windows?
+          Puppet::Util::Windows::Process.stubs(:get_process_image_name_by_pid).with(6789).returns('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
+        else
+          Puppet::Util::Execution.stubs(:execute).with(['ps', '-p', 6789, '-o', 'comm=']).returns('puppet')
+        end
         @lock.lock
         expect(Puppet::FileSystem.exist?(@lockfile)).to be_truthy
         expect(@lock.lock_pid).to eq(6789)
@@ -170,6 +185,11 @@ describe Puppet::Util::Pidlock do
     before(:each) do
       # fake our pid to be 1234
       Process.stubs(:pid).returns(1234)
+      if Puppet::Util::Platform.windows?
+        Puppet::Util::Windows::Process.stubs(:get_process_image_name_by_pid).with(1234).returns('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
+      else
+        Puppet::Util::Execution.stubs(:execute).with(['ps', '-p', 1234, '-o', 'comm=']).returns('puppet')
+      end
       # lock the file
       @lock.lock
       # fake our pid to be a different pid, to simulate someone else