puppet 4.5.3-x86-mingw32 → 4.6.1-x86-mingw32

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

@@ -208,6 +208,12 @@ describe 'The type calculator' do
       end
     end
 
+    context 'sensitive' do
+      it 'translates to PSensitiveType' do
+        expect(calculator.infer(PSensitiveType::Sensitive.new("hunter2")).class).to eq(PSensitiveType)
+      end
+    end
+
     context 'version' do
       it 'translates to PVersionType' do
         expect(calculator.infer(Semantic::Version.new(1,0,0)).class).to eq(PSemVerType)
@@ -651,7 +657,7 @@ describe 'The type calculator' do
         # Add a non-empty variant
         all_instances << variant_t(PAnyType::DEFAULT, PUnitType::DEFAULT)
         # Add a type alias that doesn't resolve to 't'
-        all_instances << type_alias_t('MyInt', 'Integer').resolve(TypeParser.new, nil)
+        all_instances << type_alias_t('MyInt', 'Integer').resolve(TypeParser.singleton, nil)
 
         all_instances.each { |i| expect(i).not_to be_assignable_to(t) }
       end
@@ -1347,7 +1353,7 @@ describe 'The type calculator' do
     end
 
     context 'for TypeAlias, such that' do
-      let!(:parser) { TypeParser.new }
+      let!(:parser) { TypeParser.singleton }
 
       it 'it is assignable to the type that it is an alias for' do
         t = type_alias_t('Alias', 'Integer').resolve(parser, nil)
@@ -1715,7 +1721,7 @@ describe 'The type calculator' do
         factory = Model::Factory
         params = [factory.PARAM('a')]
         the_block = factory.LAMBDA(params,factory.literal(42))
-        the_closure = Evaluator::Closure.new(:fake_evaluator, the_block, :fake_scope)
+        the_closure = Evaluator::Closure::Dynamic.new(:fake_evaluator, the_block, :fake_scope)
         expect(calculator.instance?(all_callables_t, the_closure)).to be_truthy
         expect(calculator.instance?(callable_t(object_t), the_closure)).to be_truthy
         expect(calculator.instance?(callable_t(object_t, object_t), the_closure)).to be_falsey
@@ -1740,7 +1746,7 @@ describe 'The type calculator' do
     end
 
     context 'and t is a TypeAlias' do
-      let!(:parser) { TypeParser.new }
+      let!(:parser) { TypeParser.singleton }
 
       it 'should consider x an instance of the aliased simple type' do
         t = type_alias_t('Alias', 'Integer').resolve(parser, nil)

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

@@ -336,7 +336,7 @@ end
     end
 
     it "should yield \"SemVer['1.x', '3.x']\" for the PSemVerType['1.x', '3.x']" do
-      expect(s.string(PSemVerType.new('1.x', '3.x'))).to eq("SemVer['1.x', '3.x']")
+      expect(s.string(PSemVerType.new(['1.x', '3.x']))).to eq("SemVer['1.x', '3.x']")
     end
 
     it 'should present a valid simple name' do

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

@@ -138,7 +138,7 @@ describe 'the type mismatch describer' do
   end
 
   context 'when using present tense' do
-    let(:parser) { TypeParser.new }
+    let(:parser) { TypeParser.singleton }
     let(:subject) { TypeMismatchDescriber.singleton }
     it 'reports a missing parameter as "has no parameter"' do
       t = parser.parse('Struct[{a=>String}]')
@@ -166,7 +166,7 @@ describe 'the type mismatch describer' do
   end
 
   context 'when using past tense' do
-    let(:parser) { TypeParser.new }
+    let(:parser) { TypeParser.singleton }
     let(:subject) { TypeMismatchDescriber.singleton }
     it 'reports a missing parameter as "did not have a parameter"' do
       t = parser.parse('Struct[{a=>String}]')

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

@@ -6,7 +6,7 @@ module Types
 describe TypeParser do
   extend RSpec::Matchers::DSL
 
-  let(:parser) { TypeParser.new }
+  let(:parser) { TypeParser.singleton }
   let(:types)  { TypeFactory }
   it "rejects a puppet expression" do
     expect { parser.parse("1 + 1") }.to raise_error(Puppet::ParseError, /The expression <1 \+ 1> is not a valid type specification/)

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

@@ -542,7 +542,7 @@ describe 'Puppet Type System' do
         type Integer = String
         notice 'hello' =~ Integer
       CODE
-      expect{ eval_and_collect_notices(code) }.to raise_error(/Attempt to redefine entity 'type\/integer'. Originally set by Puppet-Type-System\/Static-Loader/)
+      expect{ eval_and_collect_notices(code) }.to raise_error(/Attempt to redefine entity 'http:\/\/puppet\.com\/2016\.1\/runtime\/type\/integer'. Originally set by Puppet-Type-System\/Static-Loader/)
     end
   end
 

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

@@ -16,9 +16,26 @@ describe "validating 4x" do
     acceptor
   end
 
-  it 'should raise error for illegal names' do
+  it 'should raise error for illegal class names' do
     expect(validate(parse('class aaa::_bbb {}'))).to have_issue(Puppet::Pops::Issues::ILLEGAL_DEFINITION_NAME)
     expect(validate(parse('class Aaa {}'))).to have_issue(Puppet::Pops::Issues::ILLEGAL_DEFINITION_NAME)
+    expect(validate(parse('class ::aaa {}'))).to have_issue(Puppet::Pops::Issues::ILLEGAL_DEFINITION_NAME)
+  end
+
+  it 'should raise error for illegal define names' do
+    expect(validate(parse('define aaa::_bbb {}'))).to have_issue(Puppet::Pops::Issues::ILLEGAL_DEFINITION_NAME)
+    expect(validate(parse('define Aaa {}'))).to have_issue(Puppet::Pops::Issues::ILLEGAL_DEFINITION_NAME)
+    expect(validate(parse('define ::aaa {}'))).to have_issue(Puppet::Pops::Issues::ILLEGAL_DEFINITION_NAME)
+  end
+
+  it 'should raise error for illegal function names' do
+    expect(validate(parse('function aaa::_bbb() {}'))).to have_issue(Puppet::Pops::Issues::ILLEGAL_DEFINITION_NAME)
+    expect(validate(parse('function Aaa() {}'))).to have_issue(Puppet::Pops::Issues::ILLEGAL_DEFINITION_NAME)
+    expect(validate(parse('function ::aaa() {}'))).to have_issue(Puppet::Pops::Issues::ILLEGAL_DEFINITION_NAME)
+  end
+
+  it 'should raise error for illegal type names' do
+    expect(validate(parse('type ::Aaa = Any'))).to have_issue(Puppet::Pops::Issues::ILLEGAL_DEFINITION_NAME)
   end
 
   it 'should raise error for illegal variable names' do

data/spec/unit/property_spec.rb

@@ -146,6 +146,11 @@ describe Puppet::Property do
       property.class.stubs(:value_collection).returns(collection)
       expect(property.event.invalidate_refreshes).to be_truthy
     end
+
+    it "sets the redacted field on the event when the property is sensitive" do
+      property.sensitive = true
+      expect(property.event.redacted).to eq true
+    end
   end
 
   describe "when defining new values" do
@@ -413,6 +418,7 @@ describe Puppet::Property do
       it "should return true if should is empty with is => #{input.inspect}" do
         property.should = []
         expect(property).to be_insync(input)
+        expect(property.insync_values?([], input)).to be true
       end
     end
   end
@@ -427,35 +433,52 @@ describe Puppet::Property do
       it_should_behave_like "#insync?"
 
       context "if the should value is an array" do
-        before :each do property.should = [1, 2] end
+        let(:input) { [1,2] }
+        before :each do property.should = input end
 
         it "should match if is exactly matches" do
-          expect(property).to be_insync [1, 2]
+          val = [1, 2]
+          expect(property).to be_insync val
+          expect(property.insync_values?(input, val)).to be true
         end
 
         it "should match if it matches, but all stringified" do
-          expect(property).to be_insync ["1", "2"]
+          val = ["1", "2"]
+          expect(property).to be_insync val
+          expect(property.insync_values?(input, val)).to be true
         end
 
         it "should not match if some-but-not-all values are stringified" do
-          expect(property).to_not be_insync ["1", 2]
-          expect(property).to_not be_insync [1, "2"]
+          val = ["1", 2]
+          expect(property).to_not be_insync val
+          expect(property.insync_values?(input, val)).to_not be true
+          val = [1, "2"]
+          expect(property).to_not be_insync val
+          expect(property.insync_values?(input, val)).to_not be true
         end
 
         it "should not match if order is different but content the same" do
-          expect(property).to_not be_insync [2, 1]
+          val = [2, 1]
+          expect(property).to_not be_insync val
+          expect(property.insync_values?(input, val)).to_not be true
         end
 
         it "should not match if there are more items in should than is" do
-          expect(property).to_not be_insync [1]
+          val = [1]
+          expect(property).to_not be_insync val
+          expect(property.insync_values?(input, val)).to_not be true
         end
 
         it "should not match if there are less items in should than is" do
-          expect(property).to_not be_insync [1, 2, 3]
+          val = [1, 2, 3]
+          expect(property).to_not be_insync val
+          expect(property.insync_values?(input, val)).to_not be true
         end
 
         it "should not match if `is` is empty but `should` isn't" do
-          expect(property).to_not be_insync []
+          val = []
+          expect(property).to_not be_insync val
+          expect(property.insync_values?(input, val)).to_not be true
         end
       end
     end
@@ -474,26 +497,33 @@ describe Puppet::Property do
        [0, 1, 2],               # matching value in the middle
       ].each do |input|
         it "should by true if one unmodified should value of #{input.inspect} matches what is" do
+          val = 1
           property.should = input
-          expect(property).to be_insync 1
+          expect(property).to be_insync val
+          expect(property.insync_values?(input, val)).to be true
         end
 
         it "should be true if one stringified should value of #{input.inspect} matches what is" do
+          val = "1"
           property.should = input
-          expect(property).to be_insync "1"
+          expect(property).to be_insync val
+          expect(property.insync_values?(input, val)).to be true
         end
       end
 
       it "should not match if we expect a string but get the non-stringified value" do
         property.should = ["1"]
         expect(property).to_not be_insync 1
+        expect(property.insync_values?(["1"], 1)).to_not be true
       end
 
       [[0], [0, 2]].each do |input|
         it "should not match if no should values match what is" do
           property.should = input
           expect(property).to_not be_insync 1
+          expect(property.insync_values?(input, 1)).to_not be true
           expect(property).to_not be_insync "1" # shouldn't match either.
+          expect(property.insync_values?(input, "1")).to_not be true
         end
       end
     end
@@ -514,4 +544,11 @@ describe Puppet::Property do
       expect(property.property_matches?(1, "1")).to be_falsey
     end
   end
+
+  describe "#insync_values?" do
+    it "should log an exception when insync? throws one" do
+      property.expects(:insync?).raises ArgumentError
+      expect(property.insync_values?("foo","bar")).to be nil
+    end
+  end
 end

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

@@ -17,6 +17,8 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
   before :each do
     Puppet::Util::Windows::ADSI.stubs(:computer_name).returns('testcomputername')
     Puppet::Util::Windows::ADSI.stubs(:connect).returns connection
+    # this would normally query the system, but not needed for these tests
+    Puppet::Util::Windows::ADSI::Group.stubs(:localized_domains).returns([])
   end
 
   describe ".instances" do
@@ -278,6 +280,14 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
   end
 
   it "should prefer the domain component from the resolved SID" do
-    expect(provider.members_to_s(['.\Administrators'])).to eq('BUILTIN\Administrators')
+    # must lookup well known S-1-5-32-544 as actual 'Administrators' name may be localized
+    admins_sid_bytes = [1, 2, 0, 0, 0, 0, 0, 5, 32, 0, 0, 0, 32, 2, 0, 0]
+    admins_group = Puppet::Util::Windows::SID::Principal.lookup_account_sid(admins_sid_bytes)
+    # prefix just the name like .\Administrators
+    converted = provider.members_to_s([".\\#{admins_group.account}"])
+
+    # and ensure equivalent of BUILTIN\Administrators, without a leading .
+    expect(converted).to eq(admins_group.domain_account)
+    expect(converted[0]).to_not eq('.')
   end
 end

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

@@ -26,103 +26,5 @@ context 'default' do
 end
 
 describe provider_class do
-  let(:name) { 'mypackage' }
-  let(:resource) do
-    Puppet::Type.type(:package).new(
-      :name => name,
-      :ensure => :installed,
-      :provider => 'dnf'
-    )
-  end
-
-  let(:provider) do
-    provider = provider_class.new
-    provider.resource = resource
-    provider
-  end
-
-  before do
-    provider_class.stubs(:command).with(:cmd).returns('/usr/bin/dnf')
-    provider.stubs(:rpm).returns 'rpm'
-    provider.stubs(:get).with(:version).returns '1'
-    provider.stubs(:get).with(:release).returns '1'
-    provider.stubs(:get).with(:arch).returns 'i386'
-  end
-
-  describe 'provider features' do
-    it { is_expected.to be_versionable }
-    it { is_expected.to be_install_options }
-    it { is_expected.to be_virtual_packages }
-  end
-
-  describe "default provider" do
-    before do
-      Facter.expects(:value).with(:operatingsystem).returns("fedora")
-    end
-
-    it "should be the default provider on Fedora 22" do
-      Facter.expects(:value).with(:operatingsystemmajrelease).returns('22')
-      expect(described_class.default?).to be_truthy
-    end
-
-    it "should be the default provider on Fedora 23" do
-      Facter.expects(:value).with(:operatingsystemmajrelease).returns('23')
-      expect(described_class.default?).to be_truthy
-    end
-  end
-
-  # provider should repond to the following methods
-   [:install, :latest, :update, :purge, :install_options].each do |method|
-     it "should have a(n) #{method}" do
-       expect(provider).to respond_to(method)
-    end
-  end
-
-  describe 'when installing' do
-    before(:each) do
-      Puppet::Util.stubs(:which).with("rpm").returns("/bin/rpm")
-      provider.stubs(:which).with("rpm").returns("/bin/rpm")
-      Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "--version"], {:combine => true, :custom_environment => {}, :failonfail => true}).returns("4.10.1\n").at_most_once
-      Facter.stubs(:value).with(:operatingsystemmajrelease).returns('22')
-    end
-
-    it 'should call dnf install for :installed' do
-      resource.stubs(:should).with(:ensure).returns :installed
-      Puppet::Util::Execution.expects(:execute).with(['/usr/bin/dnf', '-d', '0', '-e', '1', '-y', :install, 'mypackage'])
-      provider.install
-    end
-
-    it 'should be able to downgrade' do
-      current_version = '1.2'
-      version = '1.0'
-      resource[:ensure] = '1.0'
-      Puppet::Util::Execution.expects(:execute).with(['/usr/bin/dnf', '-d', '0', '-e', '1', '-y', :downgrade, "#{name}-#{version}"])
-      provider.stubs(:query).returns(:ensure => current_version).then.returns(:ensure => version)
-      provider.install
-    end
-
-    it 'should accept install options' do
-      resource[:ensure] = :installed
-      resource[:install_options] = ['-t', {'-x' => 'expackage'}]
-
-      Puppet::Util::Execution.expects(:execute).with(['/usr/bin/dnf', '-d', '0', '-e', '1', '-y', ['-t', '-x=expackage'], :install, name])
-      provider.install
-    end
-  end
-
-  describe 'when uninstalling' do
-    it 'should use erase to purge' do
-      Puppet::Util::Execution.expects(:execute).with(['/usr/bin/dnf', '-y', :erase, name])
-      provider.purge
-    end
-  end
-
-  describe "executing yum check-update" do
-    it "passes repos to enable to 'yum check-update'" do
-      Puppet::Util::Execution.expects(:execute).with do |args, *rest|
-        expect(args).to eq %w[/usr/bin/dnf check-update --enablerepo=updates --enablerepo=fedoraplus]
-      end.returns(stub(:exitstatus => 0))
-      described_class.check_updates(%w[updates fedoraplus], [], [])
-    end
-  end
+  it_behaves_like 'RHEL package provider', provider_class, 'dnf'
 end

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

@@ -438,13 +438,13 @@ EOF
 
     it 'should raise an error on non-zero pacman exit without a filter' do
       executor.expects(:open).with('| /usr/bin/pacman -Sgg 2>&1').returns 'error!'
-      $CHILD_STATUS.stubs(:exitstatus).returns 1
+      Puppet::Util::Execution.expects(:exitstatus).returns 1
       expect { described_class.get_installed_groups(installed_packages) }.to raise_error(Puppet::ExecutionFailure, 'error!')
     end
 
     it 'should return empty groups on non-zero pacman exit with a filter' do
       executor.expects(:open).with('| /usr/bin/pacman -Sgg git 2>&1').returns ''
-      $CHILD_STATUS.stubs(:exitstatus).returns 1
+      Puppet::Util::Execution.expects(:exitstatus).returns 1
       expect(described_class.get_installed_groups(installed_packages, 'git')).to eq({})
     end
 
@@ -452,7 +452,7 @@ EOF
       pipe = stub()
       pipe.expects(:each_line)
       executor.expects(:open).with('| /usr/bin/pacman -Sgg 2>&1').yields(pipe).returns ''
-      $CHILD_STATUS.stubs(:exitstatus).returns 0
+      Puppet::Util::Execution.expects(:exitstatus).returns 0
       expect(described_class.get_installed_groups(installed_packages)).to eq({})
     end
 
@@ -460,7 +460,7 @@ EOF
       pipe = stub()
       pipe.expects(:each_line).multiple_yields(*groups)
       executor.expects(:open).with('| /usr/bin/pacman -Sgg 2>&1').yields(pipe).returns ''
-      $CHILD_STATUS.stubs(:exitstatus).returns 0
+      Puppet::Util::Execution.expects(:exitstatus).returns 0
       expect(described_class.get_installed_groups(installed_packages)).to eq({'foo' => 'package1 1.0, package2 2.0'})
     end
   end

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

@@ -209,6 +209,20 @@ describe provider_class do
         @resource[:name] = "fake_package"
         expect(@provider.latest).to eq(nil)
       end
+
+      it "should handle out-of-order version numbers for real_package" do
+        p = StringIO.new(
+          <<-EOS
+          Collecting real-package==versionplease
+            Could not find a version that satisfies the requirement real-package==versionplease (from versions: 1.11, 13.0.3, 1.6, 1.9, 1.3.2, 14.0.1, 12.0.7, 13.0.3, 1.7.2, 1.8.4, 1.6.1, 0.9.2, 1.3, 1.8.3, 12.1.1, 1.1, 1.11.6, 1.4.8, 1.6.3, 1.10.1, 14.0.2, 1.11.3, 14.0.3, 1.4rc1, 0.8.4, 1.0, 12.0.5, 14.0.6, 1.11.5, 1.7.1.1, 1.11.4, 13.0.1, 13.1.2, 1.3.3, 0.8.2, 14.0.0, 12.0, 1.8, 1.3.4, 12.0, 1.2, 12.0.6, 0.9.1, 13.1.1, 14.0.5, 15.0.2, 15.0.0, 1.4.5, 1.4.3, 13.1.1, 1.11.2, 13.1.2, 1.3.1, 13.1.0, 12.0.2, 1.11.1, 12.0.1, 12.1.0, 0.9, 1.4.4, 13.0.0, 1.4.9, 12.1.0, 1.7.1, 1.4.2, 14.0.5, 0.8.1, 1.4.6, 0.8.3, 1.11.3, 1.5.1, 1.4.7, 13.0.2, 12.0.7, 13.0.0, 1.9.1, 1.8.2, 14.0.1, 14.0.0, 14.0.4, 1.6.2, 15.0.1, 13.1.0, 0.8, 1.7, 15.0.2, 12.0.5, 13.0.1, 1.8.1, 1.11.6, 15.0.1, 12.0.4, 12.1.1, 13.0.2, 1.11.4, 1.10, 14.0.4, 14.0.6, 1.4.1, 1.4, 1.5.2, 12.0.2, 12.0.1, 14.0.3, 14.0.2, 1.11.1, 1.7.1.2, 15.0.0, 12.0.4, 1.6.4, 1.11.2, 1.5)
+          No distributions matching the version for real-package==versionplease
+          EOS
+        )
+        Puppet::Util::Execution.expects(:execpipe).with(["/fake/bin/pip", "install", "real_package==versionplease"]).yields(p).once
+        @resource[:name] = "real_package"
+        latest = @provider.latest
+        expect(latest).to eq('15.0.2')
+      end
     end
 
   end

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

@@ -5,6 +5,12 @@ describe Puppet::Type.type(:package).provider(:pkg) do
   let (:resource) { Puppet::Resource.new(:package, 'dummy', :parameters => {:name => 'dummy', :ensure => :latest}) }
   let (:provider) { described_class.new(resource) }
 
+  if Puppet.features.microsoft_windows?
+    # Get a pid for $CHILD_STATUS to latch on to
+    command = "cmd.exe /c \"exit 0\""
+    Puppet::Util::Execution.execute(command, {:failonfail => false})
+  end
+
   before :each do
     described_class.stubs(:command).with(:pkg).returns('/bin/pkg')
   end