puppet 3.3.2 → 3.4.0.rc1

data/spec/unit/pops/transformer/transform_calls_spec.rb

@@ -60,20 +60,20 @@ describe "transformation to Puppet AST for function calls" do
       astdump(parse("$a.foo")).should == "(call-method (. $a foo))"
     end
 
-    it "$a.foo {|| }" do
+    it "$a.foo ||{ }" do
       astdump(parse("$a.foo || { }")).should == "(call-method (. $a foo) (lambda ()))"
     end
 
-    it "$a.foo {|| []} # check transformation to block with empty array" do
-      astdump(parse("$a.foo || { []}")).should == "(call-method (. $a foo) (lambda (block ([]))))"
+    it "$a.foo ||{[]} # check transformation to block with empty array" do
+      astdump(parse("$a.foo || {[]}")).should == "(call-method (. $a foo) (lambda (block ([]))))"
     end
 
     it "$a.foo {|$x| }" do
-      astdump(parse("$a.foo {|$x| }")).should == "(call-method (. $a foo) (lambda (parameters x) ()))"
+      astdump(parse("$a.foo |$x| { }")).should == "(call-method (. $a foo) (lambda (parameters x) ()))"
     end
 
-    it "$a.foo {|$x| $b = $x}" do
-      astdump(parse("$a.foo {|$x| $b = $x}")).should ==
+    it "$a.foo |$x| { $b = $x}" do
+      astdump(parse("$a.foo |$x| { $b = $x}")).should ==
       "(call-method (. $a foo) (lambda (parameters x) (block (= $b $x))))"
     end
   end

data/spec/unit/pops/transformer/transform_containers_spec.rb

@@ -154,12 +154,12 @@ describe "transformation to Puppet AST for containers" do
 
     it "node foo inherits 'bar' {}" do
       # AST can not differentiate between bare word and string
-      astdump(parse("node foo inherits 'bar' {}")).should == "(node (matches 'foo') (parent 'bar') ())"
+      astdump(parse("node foo inherits 'bar' {}")).should == "(node (matches 'foo') (parent bar) ())"
     end
 
     it "node foo inherits default {}" do
       # AST can not differentiate between bare word and string
-      astdump(parse("node foo inherits default {}")).should == "(node (matches 'foo') (parent :default) ())"
+      astdump(parse("node foo inherits default {}")).should == "(node (matches 'foo') (parent default) ())"
     end
 
     it "node /web.*/ {}" do

data/spec/unit/pops/validator/validator_spec.rb

@@ -0,0 +1,31 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+require 'puppet/pops'
+require 'puppet_spec/pops'
+
+# relative to this spec file (./) does not work as this file is loaded by rspec
+require File.join(File.dirname(__FILE__), '../parser/parser_rspec_helper')
+
+describe "validating 3x" do
+  include ParserRspecHelper
+  include PuppetSpec::Pops
+
+  let(:acceptor) { Puppet::Pops::Validation::Acceptor.new() }
+  let(:validator) { Puppet::Pops::Validation::ValidatorFactory_3_1.new().validator(acceptor) }
+
+  def validate(model)
+    validator.validate(model)
+    acceptor
+  end
+
+  it 'should raise error for illegal names' do
+    expect(validate(fqn('Aaa'))).to have_issue(Puppet::Pops::Issues::ILLEGAL_NAME)
+    expect(validate(fqn('AAA'))).to have_issue(Puppet::Pops::Issues::ILLEGAL_NAME)
+  end
+
+  it 'should raise error for illegal variable names' do
+    expect(validate(fqn('Aaa').var())).to have_issue(Puppet::Pops::Issues::ILLEGAL_NAME)
+    expect(validate(fqn('AAA').var())).to have_issue(Puppet::Pops::Issues::ILLEGAL_NAME)
+  end
+
+end

data/spec/unit/provider/augeas/augeas_spec.rb

@@ -276,6 +276,61 @@ describe provider_class do
       @provider.need_to_run?.should == true
     end
 
+    describe "performing numeric comparisons (#22617)" do
+      it "should return true when a get string compare is true" do
+        @resource[:onlyif] = "get bpath > a"
+        @augeas.stubs("get").returns("b")
+        @provider.need_to_run?.should == true
+      end
+
+      it "should return false when a get string compare is false" do
+        @resource[:onlyif] = "get a19path > a2"
+        @augeas.stubs("get").returns("a19")
+        @provider.need_to_run?.should == false
+      end
+
+      it "should return true when a get int gt compare is true" do
+        @resource[:onlyif] = "get path19 > 2"
+        @augeas.stubs("get").returns("19")
+        @provider.need_to_run?.should == true
+      end
+
+      it "should return true when a get int ge compare is true" do
+        @resource[:onlyif] = "get path19 >= 2"
+        @augeas.stubs("get").returns("19")
+        @provider.need_to_run?.should == true
+      end
+
+      it "should return true when a get int lt compare is true" do
+        @resource[:onlyif] = "get path2 < 19"
+        @augeas.stubs("get").returns("2")
+        @provider.need_to_run?.should == true
+      end
+
+      it "should return false when a get int le compare is false" do
+        @resource[:onlyif] = "get path39 <= 4"
+        @augeas.stubs("get").returns("39")
+        @provider.need_to_run?.should == false
+      end
+    end
+    describe "performing is_numeric checks (#22617)" do
+      it "should return false for nil" do
+        @provider.is_numeric?(nil).should == false
+      end
+      it "should return true for Fixnums" do
+        @provider.is_numeric?(9).should == true
+      end
+      it "should return true for numbers in Strings" do
+        @provider.is_numeric?('9').should == true
+      end
+      it "should return false for non-number Strings" do
+        @provider.is_numeric?('x9').should == false
+      end
+      it "should return false for other types" do
+        @provider.is_numeric?([true]).should == false
+      end
+    end
+
     it "should return false when a get filter does not match" do
       @resource[:onlyif] = "get path == another value"
       @augeas.stubs("get").returns("value")
@@ -619,7 +674,7 @@ describe provider_class do
       link = tmpfile('link')
       target = tmpfile('target')
       FileUtils.touch(target)
-      FileUtils.symlink(target, link)
+      Puppet::FileSystem::File.new(target).symlink(link)
 
       resource = Puppet::Type.type(:augeas).new(
         :name => 'test',
@@ -634,7 +689,7 @@ describe provider_class do
       catalog.apply
 
       File.ftype(link).should == 'link'
-      File.readlink(link).should == target
+      Puppet::FileSystem::File.new(link).readlink().should == target
       File.read(target).should =~ /PermitRootLogin no/
     end
   end

data/spec/unit/provider/exec/posix_spec.rb

@@ -64,7 +64,7 @@ describe Puppet::Type.type(:exec).provider(:posix) do
         provider.resource[:path] = [File.dirname(command)]
         filename = File.basename(command)
 
-        Puppet::Util::Execution.expects(:execute).with { |cmdline, arguments| (cmdline == filename) && (arguments.is_a? Hash) }
+        Puppet::Util::Execution.expects(:execute).with { |cmdline, arguments| (cmdline == filename) && (arguments.is_a? Hash) }.returns(Puppet::Util::Execution::ProcessOutput.new('', 0))
 
         provider.run(filename)
       end
@@ -95,7 +95,7 @@ describe Puppet::Type.type(:exec).provider(:posix) do
       provider.resource[:path] = ['/bogus/bin']
       command = make_exe
 
-      Puppet::Util::Execution.expects(:execute).with { |cmdline, arguments| (cmdline == "#{command} bar --sillyarg=true --blah") && (arguments.is_a? Hash) }
+      Puppet::Util::Execution.expects(:execute).with { |cmdline, arguments| (cmdline == "#{command} bar --sillyarg=true --blah") && (arguments.is_a? Hash) }.returns(Puppet::Util::Execution::ProcessOutput.new('', 0))
       provider.run("#{command} bar --sillyarg=true --blah")
     end
 
@@ -110,11 +110,16 @@ describe Puppet::Type.type(:exec).provider(:posix) do
       provider.resource[:environment] = ['WHATEVER=/something/else', 'WHATEVER=/foo']
       command = make_exe
 
-      Puppet::Util::Execution.expects(:execute).with { |cmdline, arguments| (cmdline == command) && (arguments.is_a? Hash) }
+      Puppet::Util::Execution.expects(:execute).with { |cmdline, arguments| (cmdline == command) && (arguments.is_a? Hash) }.returns(Puppet::Util::Execution::ProcessOutput.new('', 0))
       provider.run(command)
       @logs.map {|l| "#{l.level}: #{l.message}" }.should == ["warning: Overriding environment setting 'WHATEVER' with '/foo'"]
     end
 
+    it "should set umask before execution if umask parameter is in use" do
+      provider.resource[:umask] = '0027'
+      Puppet::Util.expects(:withumask).with(0027)
+      provider.run(provider.resource[:command])
+    end
 
     describe "posix locale settings", :unless => Puppet.features.microsoft_windows? do
       # a sentinel value that we can use to emulate what locale environment variables might be set to on an international

data/spec/unit/provider/file/posix_spec.rb

@@ -85,7 +85,7 @@ describe Puppet::Type.type(:file).provider(:posix), :if => Puppet.features.posix
   describe "#owner" do
     it "should return the uid of the file owner" do
       FileUtils.touch(path)
-      owner = File.stat(path).uid
+      owner = Puppet::FileSystem::File.new(path).stat.uid
 
       provider.owner.should == owner
     end
@@ -178,7 +178,7 @@ describe Puppet::Type.type(:file).provider(:posix), :if => Puppet.features.posix
   describe "#group" do
     it "should return the gid of the file group" do
       FileUtils.touch(path)
-      group = File.stat(path).gid
+      group = Puppet::FileSystem::File.new(path).stat.gid
 
       provider.group.should == group
     end

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

@@ -30,6 +30,58 @@ describe Puppet::Type.type(:group).provider(:windows_adsi) do
     end
   end
 
+  describe "group type :members property helpers", :if => Puppet.features.microsoft_windows? do
+
+    let(:user1) { stub(:account => 'user1', :domain => '.', :to_s => 'user1sid') }
+    let(:user2) { stub(:account => 'user2', :domain => '.', :to_s => 'user2sid') }
+
+    before :each do
+      Puppet::Util::Windows::Security.stubs(:name_to_sid_object).with('user1').returns(user1)
+      Puppet::Util::Windows::Security.stubs(:name_to_sid_object).with('user2').returns(user2)
+    end
+
+    describe "#members_insync?" do
+      it "should return false when current is nil" do
+        provider.members_insync?(nil, ['user2']).should be_false
+      end
+      it "should return false when should is nil" do
+        provider.members_insync?(['user1'], nil).should be_false
+      end
+      it "should return false for differing lists of members" do
+        provider.members_insync?(['user1'], ['user2']).should be_false
+        provider.members_insync?(['user1'], []).should be_false
+        provider.members_insync?([], ['user2']).should be_false
+      end
+      it "should return true for same lists of members" do
+        provider.members_insync?(['user1', 'user2'], ['user1', 'user2']).should be_true
+      end
+      it "should return true for same lists of unordered members" do
+        provider.members_insync?(['user1', 'user2'], ['user2', 'user1']).should be_true
+      end
+      it "should return true for same lists of members irrespective of duplicates" do
+        provider.members_insync?(['user1', 'user2', 'user2'], ['user2', 'user1', 'user1']).should be_true
+      end
+    end
+
+    describe "#members_to_s" do
+      it "should return an empty string on non-array input" do
+        [Object.new, {}, 1, :symbol, ''].each do |input|
+          provider.members_to_s(input).should be_empty
+        end
+      end
+      it "should return an empty string on empty or nil users" do
+        provider.members_to_s([]).should be_empty
+        provider.members_to_s(nil).should be_empty
+      end
+      it "should return a user string like DOMAIN\\USER" do
+        provider.members_to_s(['user1']).should == '.\user1'
+      end
+      it "should return a user string like DOMAIN\\USER,DOMAIN2\\USER2" do
+        provider.members_to_s(['user1', 'user2']).should == '.\user1,.\user2'
+      end
+    end
+  end
+
   describe "when managing members" do
     it "should be able to provide a list of members" do
       provider.group.stubs(:members).returns ['user1', 'user2', 'user3']
@@ -37,11 +89,22 @@ describe Puppet::Type.type(:group).provider(:windows_adsi) do
       provider.members.should =~ ['user1', 'user2', 'user3']
     end
 
-    it "should be able to set group members" do
+    it "should be able to set group members", :if => Puppet.features.microsoft_windows? do
       provider.group.stubs(:members).returns ['user1', 'user2']
 
-      provider.group.expects(:remove_members).with('user1')
-      provider.group.expects(:add_members).with('user3')
+      member_sids = [
+        stub(:account => 'user1', :domain => 'testcomputername'),
+        stub(:account => 'user2', :domain => 'testcomputername'),
+        stub(:account => 'user3', :domain => 'testcomputername'),
+      ]
+
+      provider.group.stubs(:member_sids).returns(member_sids[0..1])
+
+      Puppet::Util::Windows::Security.expects(:name_to_sid_object).with('user2').returns(member_sids[1])
+      Puppet::Util::Windows::Security.expects(:name_to_sid_object).with('user3').returns(member_sids[2])
+
+      provider.group.expects(:remove_member_sids).with(member_sids[0])
+      provider.group.expects(:add_member_sids).with(member_sids[2])
 
       provider.members = ['user2', 'user3']
     end
@@ -97,4 +160,8 @@ describe Puppet::Type.type(:group).provider(:windows_adsi) do
     provider.expects(:fail).with { |msg| msg =~ /gid is read-only/ }
     provider.send(:gid=, 500)
   end
+
+  it "should prefer the domain component from the resolved SID", :if => Puppet.features.microsoft_windows? do
+    provider.members_to_s(['.\Administrators']).should == 'BUILTIN\Administrators'
+  end
 end

data/spec/unit/provider/nameservice/directoryservice_spec.rb

@@ -110,7 +110,7 @@ describe 'DirectoryService password behavior' do
 
   it 'should execute convert_binary_to_xml once when getting the password on >= 10.7' do
     subject.expects(:convert_binary_to_xml).returns({'SALTED-SHA512' => StringIO.new(pw_string)})
-    File.expects(:exists?).with(plist_path).once.returns(true)
+    Puppet::FileSystem::File.expects(:exist?).with(plist_path).once.returns(true)
     Plist.expects(:parse_xml).returns(shadow_hash_data)
     # On Mac OS X 10.7 we first need to convert to xml when reading the password
     subject.expects(:plutil).with('-convert', 'xml1', '-o', '/dev/stdout', plist_path)
@@ -126,7 +126,7 @@ describe 'DirectoryService password behavior' do
   it 'should convert xml-to-binary and binary-to-xml when setting the pw on >= 10.7' do
     subject.expects(:convert_binary_to_xml).returns({'SALTED-SHA512' => StringIO.new(pw_string)})
     subject.expects(:convert_xml_to_binary).returns(binary_plist)
-    File.expects(:exists?).with(plist_path).once.returns(true)
+    Puppet::FileSystem::File.expects(:exist?).with(plist_path).once.returns(true)
     Plist.expects(:parse_xml).returns(shadow_hash_data)
     # On Mac OS X 10.7 we first need to convert to xml
     subject.expects(:plutil).with('-convert', 'xml1', '-o', '/dev/stdout', plist_path)
@@ -138,7 +138,7 @@ describe 'DirectoryService password behavior' do
 
   it '[#13686] should handle an empty ShadowHashData field in the users plist' do
     subject.expects(:convert_xml_to_binary).returns(binary_plist)
-    File.expects(:exists?).with(plist_path).once.returns(true)
+    Puppet::FileSystem::File.expects(:exist?).with(plist_path).once.returns(true)
     Plist.expects(:parse_xml).returns({'ShadowHashData' => nil})
     subject.expects(:plutil).with('-convert', 'xml1', '-o', '/dev/stdout', plist_path)
     subject.expects(:plutil).with('-convert', 'binary1', plist_path)

data/spec/unit/provider/package/apt_spec.rb

@@ -63,7 +63,7 @@ Version table:
 
   it "should preseed with the provided responsefile when preseeding is called for" do
     @resource.expects(:[]).with(:responsefile).returns "/my/file"
-    FileTest.expects(:exist?).with("/my/file").returns true
+    Puppet::FileSystem::File.expects(:exist?).with("/my/file").returns true
 
     @provider.expects(:info)
     @provider.expects(:preseed).with("/my/file")

data/spec/unit/provider/package/msi_spec.rb

@@ -24,9 +24,8 @@ describe Puppet::Type.type(:package).provider(:msi) do
     MsiPackage.stubs(:installer).returns(installer)
   end
 
-  before :each do
-    # make sure we never try to execute msiexec
-    provider.expects(:execute).never
+  def expect_execute(command, status)
+    provider.expects(:execute).with(command, execute_options).returns(Puppet::Util::Execution::ProcessOutput.new('',status))
   end
 
   describe 'provider features' do
@@ -38,6 +37,7 @@ describe Puppet::Type.type(:package).provider(:msi) do
 
   describe 'on Windows', :as_platform => :windows do
     it 'should not be the default provider' do
+      # provider.expects(:execute).never
       Puppet::Type.type(:package).defaultprovider.should_not == subject.class
     end
   end
@@ -90,9 +90,7 @@ describe Puppet::Type.type(:package).provider(:msi) do
   end
 
   context '#install' do
-    before :each do
-      provider.stubs(:execute)
-    end
+    let (:command) { "msiexec.exe /qn /norestart /i #{source}" }
 
     it 'should require the source parameter' do
       resource = Puppet::Type.type(:package).new(:name => name, :provider => :msi)
@@ -104,40 +102,27 @@ describe Puppet::Type.type(:package).provider(:msi) do
 
     it 'should install using the source and install_options' do
       resource[:install_options] = { 'INSTALLDIR' => 'C:\mysql-5.1' }
-
-      provider.expects(:execute).with("msiexec.exe /qn /norestart /i #{source} INSTALLDIR=C:\\mysql-5.1", execute_options)
-      provider.expects(:exit_status).returns(0)
-
-      provider.install
-    end
-
-    it 'should warn if the package requests a reboot' do
-      provider.stubs(:exit_status).returns(194)
-
-      provider.expects(:warning).with('The package requested a reboot to finish the operation.')
+      expect_execute("#{command} INSTALLDIR=C:\\mysql-5.1", 0)
 
       provider.install
     end
 
     it 'should warn if reboot initiated' do
-      provider.stubs(:exit_status).returns(1641)
-
+      expect_execute(command, 1641)
       provider.expects(:warning).with('The package installed successfully and the system is rebooting now.')
 
       provider.install
     end
 
     it 'should warn if reboot required' do
-      provider.stubs(:exit_status).returns(3010)
-
+      expect_execute(command, 3010)
       provider.expects(:warning).with('The package installed successfully, but the system must be rebooted.')
 
       provider.install
     end
 
     it 'should fail otherwise', :if => Puppet.features.microsoft_windows? do
-      provider.stubs(:execute)
-      provider.stubs(:exit_status).returns(5)
+      expect_execute(command, 5)
 
       expect do
         provider.install
@@ -146,6 +131,9 @@ describe Puppet::Type.type(:package).provider(:msi) do
   end
 
   context '#uninstall' do
+
+    let (:command) { "msiexec.exe /qn /norestart /x #{productcode}" }
+
     before :each do
       resource[:ensure] = :absent
       provider.set(:productcode => productcode)
@@ -159,42 +147,27 @@ describe Puppet::Type.type(:package).provider(:msi) do
     end
 
     it 'should uninstall using the productcode' do
-      provider.expects(:execute).with("msiexec.exe /qn /norestart /x #{productcode}", execute_options)
-      provider.expects(:exit_status).returns(0)
-
-      provider.uninstall
-    end
-
-    it 'should warn if the package requests a reboot' do
-      provider.stubs(:execute)
-      provider.stubs(:exit_status).returns(194)
-
-      provider.expects(:warning).with('The package requested a reboot to finish the operation.')
+      expect_execute(command, 0)
 
       provider.uninstall
     end
 
     it 'should warn if reboot initiated' do
-      provider.stubs(:execute)
-      provider.stubs(:exit_status).returns(1641)
-
+      expect_execute(command, 1641)
       provider.expects(:warning).with('The package uninstalled successfully and the system is rebooting now.')
 
       provider.uninstall
     end
 
     it 'should warn if reboot required' do
-      provider.stubs(:execute)
-      provider.stubs(:exit_status).returns(3010)
-
+      expect_execute(command, 3010)
       provider.expects(:warning).with('The package uninstalled successfully, but the system must be rebooted.')
 
       provider.uninstall
     end
 
     it 'should fail otherwise', :if => Puppet.features.microsoft_windows? do
-      provider.stubs(:execute)
-      provider.stubs(:exit_status).returns(5)
+      expect_execute(command, 5)
 
       expect do
         provider.uninstall