puppet 5.4.0-x64-mingw32 → 5.5.0-x64-mingw32

data/spec/unit/provider/sshkey/parsed_spec.rb

@@ -1,8 +1,6 @@
 #! /usr/bin/env ruby
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:sshkey).provider(:parsed)
-
 describe "sshkey parsed provider" do
   let :type do Puppet::Type.type(:sshkey) end
   let :provider do type.provider(:parsed) end

data/spec/unit/provider/user/useradd_spec.rb

@@ -99,7 +99,7 @@ describe Puppet::Type.type(:user).provider(:useradd) do
       resource[:password_max_age] = 10
       resource[:password_warn_days] = 15
       provider.expects(:execute).with(includes('/usr/sbin/useradd'), kind_of(Hash))
-      provider.expects(:execute).with(['/usr/bin/chage', '-m', 5, '-M', 10, '-W', 15, 'myuser'], has_entry(:custom_environment, {}))
+      provider.expects(:execute).with(['/usr/bin/chage', '-m', 5, '-M', 10, '-W', 15, 'myuser'], has_entries({:failonfail => true, :combine => true, :custom_environment => {}}))
       provider.create
     end
 
@@ -125,10 +125,10 @@ describe Puppet::Type.type(:user).provider(:useradd) do
         expect { provider.create }.to raise_error(Puppet::Error, "UID 505 already exists, use allowdupe to force user creation")
       end
 
-      it "should not use -G for luseradd and should call lusermod with -G after luseradd when groups property is set" do
+      it "should not use -G for luseradd and should call usermod with -G after luseradd when groups property is set" do
         resource[:groups] = ['group1', 'group2']
-        provider.expects(:execute).with(Not(includes("-G")), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
-        provider.expects(:execute).with(includes('/usr/sbin/lusermod'), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        provider.expects(:execute).with(all_of(includes('/usr/sbin/luseradd'), Not(includes('-G'))), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        provider.expects(:execute).with(all_of(includes('/usr/sbin/usermod'), includes('-G')), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
         provider.create
       end
 
@@ -175,30 +175,36 @@ describe Puppet::Type.type(:user).provider(:useradd) do
       end
 
       it "should use usermod" do
-        provider.expects(:execute).with(['/usr/sbin/usermod', '-u', 150, 'myuser'], has_entry(:custom_environment, {}))
+        provider.expects(:execute).with(['/usr/sbin/usermod', '-u', 150, 'myuser'], has_entries({:failonfail => true, :combine => true, :custom_environment => {}}))
         provider.uid = 150
       end
 
       it "should use -o when allowdupe=true" do
         resource[:allowdupe] = :true
-        provider.expects(:execute).with(includes('-o'), has_entry(:custom_environment, {}))
+        provider.expects(:execute).with(includes('-o'), has_entries({:failonfail => true, :combine => true, :custom_environment => {}}))
         provider.uid = 505
       end
 
       it 'should use chage for password_min_age' do
-        provider.expects(:execute).with(['/usr/bin/chage', '-m', 100, 'myuser'], has_entry(:custom_environment, {}))
+        provider.expects(:execute).with(['/usr/bin/chage', '-m', 100, 'myuser'], has_entries({:failonfail => true, :combine => true, :custom_environment => {}}))
         provider.password_min_age = 100
       end
 
       it 'should use chage for password_max_age' do
-        provider.expects(:execute).with(['/usr/bin/chage', '-M', 101, 'myuser'], has_entry(:custom_environment, {}))
+        provider.expects(:execute).with(['/usr/bin/chage', '-M', 101, 'myuser'], has_entries({:failonfail => true, :combine => true, :custom_environment => {}}))
         provider.password_max_age = 101
       end
 
       it 'should use chage for password_warn_days' do
-        provider.expects(:execute).with(['/usr/bin/chage', '-W', 99, 'myuser'], has_entry(:custom_environment, {}))
+        provider.expects(:execute).with(['/usr/bin/chage', '-W', 99, 'myuser'], has_entries({:failonfail => true, :combine => true, :custom_environment => {}}))
         provider.password_warn_days = 99
       end
+
+      it 'should not call check_allow_dup if not modifying the uid' do
+        provider.expects(:check_allow_dup).never
+        provider.expects(:execute)
+        provider.home = 'foo/bar'
+      end
     end
 
     describe "on systems with the libuser and forcelocal=true" do

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

@@ -81,9 +81,9 @@ describe Puppet::Type.type(:user).provider(:windows_adsi), :if => Puppet.feature
     let(:group3) { stub(:account => 'group3', :domain => '.', :sid => 'group3sid') }
 
     before :each do
-      Puppet::Util::Windows::SID.stubs(:name_to_sid_object).with('group1').returns(group1)
-      Puppet::Util::Windows::SID.stubs(:name_to_sid_object).with('group2').returns(group2)
-      Puppet::Util::Windows::SID.stubs(:name_to_sid_object).with('group3').returns(group3)
+      Puppet::Util::Windows::SID.stubs(:name_to_principal).with('group1').returns(group1)
+      Puppet::Util::Windows::SID.stubs(:name_to_principal).with('group2').returns(group2)
+      Puppet::Util::Windows::SID.stubs(:name_to_principal).with('group3').returns(group3)
     end
 
     it "should return true for same lists of members" do
@@ -267,7 +267,7 @@ describe Puppet::Type.type(:user).provider(:windows_adsi), :if => Puppet.feature
   end
 
   it 'should be able to test whether a user exists' do
-    Puppet::Util::Windows::SID.stubs(:name_to_sid_object).returns(nil)
+    Puppet::Util::Windows::SID.stubs(:name_to_principal).returns(nil)
     Puppet::Util::Windows::ADSI.stubs(:connect).returns stub('connection', :Class => 'User')
     expect(provider).to be_exists
 

data/spec/unit/provider/yumrepo/inifile_spec.rb

@@ -1,7 +1,10 @@
 require 'spec_helper'
+require 'puppet_spec/files'
 
 describe Puppet::Type.type(:yumrepo).provider(:inifile) do
 
+  include PuppetSpec::Files
+
   after(:each) do
     described_class.clear
   end
@@ -323,4 +326,77 @@ describe Puppet::Type.type(:yumrepo).provider(:inifile) do
       end
     end
   end
+
+  describe "resource application after prefetch" do
+    let(:type_instance) do
+      Puppet::Type.type(:yumrepo).new(
+          :name     => 'puppetlabs-products',
+          :ensure   => :present,
+          :baseurl  => 'http://yum.puppetlabs.com/el/6/products/$basearch',
+          :descr    => 'Puppet Labs Products El 6 - $basearch',
+          :enabled  => '1',
+          :gpgcheck => '1',
+          :gpgkey   => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppetlabs'
+      )
+    end
+
+    let(:provider) do
+      described_class.new(type_instance)
+    end
+
+    before :each do
+      @yumrepo_dir = tmpdir('yumrepo_integration_specs')
+      @yumrepo_conf_file = tmpfile('yumrepo_conf_file', @yumrepo_dir)
+      described_class.stubs(:reposdir).returns [@yumrepo_dir]
+      described_class.stubs(:repofiles).returns [@yumrepo_conf_file]
+      type_instance.provider = provider
+    end
+
+    it "preserves repo file contents that were created after prefetch" do
+      provider.class.prefetch({})
+      # we specifically want to create a file after prefetch has happened so that
+      # none of the sections in the file exist in the prefetch cache
+      repo_file = File.join(@yumrepo_dir, 'puppetlabs-products.repo')
+      contents = <<-HEREDOC
+[puppetlabs-products]
+name=created_by_package_after_prefetch
+enabled=1
+failovermethod=priority
+gpgcheck=0
+
+[additional_section]
+name=Extra Packages for Enterprise Linux 6 - $basearch - Debug
+#baseurl=http://download.fedoraproject.org/pub/epel/6/$basearch/debug
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-6&arch=$basearch
+failovermethod=priority
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6
+gpgcheck=1
+      HEREDOC
+      File.open(repo_file, 'wb') { |f| f.write(contents)}
+
+      provider.create
+      provider.flush
+
+      expected_contents = <<-HEREDOC
+[puppetlabs-products]
+name=Puppet Labs Products El 6 - $basearch
+enabled=1
+failovermethod=priority
+gpgcheck=1
+
+baseurl=http://yum.puppetlabs.com/el/6/products/$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppetlabs
+[additional_section]
+name=Extra Packages for Enterprise Linux 6 - $basearch - Debug
+#baseurl=http://download.fedoraproject.org/pub/epel/6/$basearch/debug
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-6&arch=$basearch
+failovermethod=priority
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6
+gpgcheck=1
+      HEREDOC
+      expect(File.read(repo_file)).to eq(expected_contents)
+    end
+  end
 end

data/spec/unit/puppet_pal_2pec.rb

@@ -691,7 +691,7 @@ describe 'Puppet Pal' do
         end.to raise_error(/A block must be given to 'in_tmp_environment/)
       end
 
-      it 'errors if an env_name is given and is not a String[1]' do |ctx|
+      it 'errors if an env_name is given and is not a String[1]' do
         expect do
           Puppet::Pal.in_tmp_environment('', modulepath: modulepath, facts: node_facts) { |ctx| }
         end.to raise_error(/temporary environment name has wrong type/)
@@ -839,7 +839,7 @@ describe 'Puppet Pal' do
 
       it 'a given "modulepath" overrides the default' do
         expect do
-          result = Puppet::Pal.in_environment('pal_env', env_dir: testing_env_dir, modulepath: [], facts: node_facts) do |ctx|
+          Puppet::Pal.in_environment('pal_env', env_dir: testing_env_dir, modulepath: [], facts: node_facts) do |ctx|
             ctx.with_script_compiler {|c| c.evaluate_string('a::afunc()') }
           end
         end.to raise_error(/Unknown function: 'a::afunc'/)
@@ -874,7 +874,7 @@ describe 'Puppet Pal' do
         end.to raise_error(/The environment directory '.*' does not exist/)
       end
 
-      it 'errors if an env_name is given and is not a String[1]' do |ctx|
+      it 'errors if an env_name is given and is not a String[1]' do
         expect do
           Puppet::Pal.in_environment('', env_dir: testing_env_dir, facts: node_facts)  { |ctx| }
         end.to raise_error(/env_name has wrong type/)
@@ -917,7 +917,7 @@ describe 'Puppet Pal' do
       it 'a given "modulepath" overrides the default' do
         testing_env_dir # creates the structure
         expect do
-          result = Puppet::Pal.in_environment('pal_env', envpath: environments_dir, modulepath: [], facts: node_facts) do |ctx|
+          Puppet::Pal.in_environment('pal_env', envpath: environments_dir, modulepath: [], facts: node_facts) do |ctx|
             ctx.with_script_compiler { |c| c.evaluate_string('a::afunc()') }
           end
         end.to raise_error(/Unknown function: 'a::afunc'/)
@@ -940,7 +940,6 @@ describe 'Puppet Pal' do
 
       it 'the envpath can have multiple entries - that are searched for the given env' do
         testing_env_dir # creates the structure
-        several_dirs = "/tmp/nowhere/to/be/found:#{environments_dir}"
         result = Puppet::Pal.in_environment('pal_env', envpath: environments_dir, facts: node_facts) do |ctx|
           ctx.with_script_compiler {|c| c.evaluate_string('a::afunc()') }
         end

data/spec/unit/resource/catalog_spec.rb

@@ -160,7 +160,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
     before do
       @original = Puppet::Resource::Catalog.new("mynode")
       @original.tag(*%w{one two three})
-      @original.add_class *%w{four five six}
+      @original.add_class(*%w{four five six})
 
       @top            = Puppet::Resource.new :class, 'top'
       @topobject      = Puppet::Resource.new :file, @basepath+'/topobject'
@@ -233,7 +233,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
     before :each do
       @original = Puppet::Resource::Catalog.new("mynode")
       @original.tag(*%w{one two three})
-      @original.add_class *%w{four five six}
+      @original.add_class(*%w{four five six})
 
       @r1 = stub_everything 'r1', :ref => "File[/a]"
       @r1.stubs(:respond_to?).with(:ref).returns(true)
@@ -438,7 +438,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
     it "should optionally support an initialization block and should finalize after such blocks" do
       @one.expects :finish
       @two.expects :finish
-      config = Puppet::Resource::Catalog.new("host") do |conf|
+      Puppet::Resource::Catalog.new("host") do |conf|
         conf.add_resource @one
         conf.add_resource @two
       end
@@ -629,6 +629,11 @@ describe Puppet::Resource::Catalog, "when compiling" do
       @catalog.apply
     end
 
+    it "should add a transaction evalution time to the report" do
+      @transaction.report.expects(:add_times).with(:transaction_evaluation, kind_of(Numeric))
+      @catalog.apply
+    end
+
     it "should return the transaction" do
       expect(@catalog.apply).to equal(@transaction)
     end

data/spec/unit/resource/status_spec.rb

@@ -32,7 +32,7 @@ describe Puppet::Resource::Status do
       expect(status.send(attr)).to eq("foo")
     end
 
-    it "should have a boolean method for determining whehter it was #{attr}" do
+    it "should have a boolean method for determining whether it was #{attr}" do
       status.send(attr.to_s + "=", "foo")
       expect(status).to send("be_#{attr}")
     end
@@ -59,7 +59,7 @@ describe Puppet::Resource::Status do
   end
 
   it "should copy the resource's tags" do
-    resource.expects(:tags).returns %w{foo bar}
+    resource.tag('foo', 'bar')
     status = Puppet::Resource::Status.new(resource)
     expect(status).to be_tagged("foo")
     expect(status).to be_tagged("bar")
@@ -70,6 +70,15 @@ describe Puppet::Resource::Status do
     expect(Puppet::Resource::Status.new(resource).resource).to eq("foo")
   end
 
+  it 'should set the provider_used correctly' do
+    expected_name = if Puppet::Util::Platform.windows?
+                      'windows'
+                    else
+                      'posix'
+                    end
+    expect(status.provider_used).to eq(expected_name)
+  end
+
   it "should support tags" do
     expect(Puppet::Resource::Status.ancestors).to include(Puppet::Util::Tagging)
   end
@@ -146,7 +155,7 @@ describe Puppet::Resource::Status do
   context 'when serializing' do
     let(:status) do
       s = Puppet::Resource::Status.new(resource)
-      s.file = "/foo.rb"
+      s.file = '/foo.rb'
       s.line = 27
       s.evaluation_time = 2.7
       s.tags = %w{one two}
@@ -155,10 +164,11 @@ describe Puppet::Resource::Status do
       s.changed = true
       s.out_of_sync = true
       s.skipped = false
+      s.provider_used = 'provider_used_class_name'
       s
     end
 
-    it "should round trip through json" do
+    it 'should round trip through json' do
       expect(status.containment_path).to eq(containment_path)
 
       tripped = Puppet::Resource::Status.from_data_hash(JSON.parse(status.to_json))
@@ -169,6 +179,7 @@ describe Puppet::Resource::Status do
       expect(tripped.line).to eq(status.line)
       expect(tripped.resource).to eq(status.resource)
       expect(tripped.resource_type).to eq(status.resource_type)
+      expect(tripped.provider_used).to eq(status.provider_used)
       expect(tripped.evaluation_time).to eq(status.evaluation_time)
       expect(tripped.tags).to eq(status.tags)
       expect(tripped.time).to eq(status.time)

data/spec/unit/resource/type_spec.rb

@@ -524,7 +524,6 @@ describe Puppet::Resource::Type do
       subscope = stub 'subscope', :compiler => @compiler
       @scope.expects(:newscope).with(:source => @type, :resource => @resource).returns subscope
 
-      elevel = 876
       subscope.expects(:with_guarded_scope).yields
       subscope.expects(:ephemeral_from).with(match, nil, nil).returns subscope
       code.expects(:safeevaluate).with(subscope)
@@ -778,7 +777,7 @@ describe Puppet::Resource::Type do
 
   describe "when merging code from another instance" do
     def code(str)
-      factory = Puppet::Pops::Model::Factory.literal(str)
+      Puppet::Pops::Model::Factory.literal(str)
     end
 
     it "should fail unless it is a class" do
@@ -811,7 +810,7 @@ describe Puppet::Resource::Type do
     it "should copy the other class's parent if it has not parent" do
       dest = Puppet::Resource::Type.new(:hostclass, "bar")
 
-      parent = Puppet::Resource::Type.new(:hostclass, "parent")
+      Puppet::Resource::Type.new(:hostclass, "parent")
       source = Puppet::Resource::Type.new(:hostclass, "foo", :parent => "parent")
       dest.merge(source)
 

data/spec/unit/settings_spec.rb

@@ -104,7 +104,6 @@ describe Puppet::Settings do
     end
 
     it "should fail if the app defaults hash is missing any required values" do
-      incomplete_default_values = default_values.reject { |key, _| key == :confdir }
       expect {
         @settings.initialize_app_defaults(default_values.reject { |key, _| key == :confdir })
       }.to raise_error(Puppet::Settings::SettingsError)
@@ -556,7 +555,8 @@ describe Puppet::Settings do
           :two    => { :default => "$one TWO", :desc => "b"},
           :three  => { :default => "$one $two THREE", :desc => "c"},
           :four   => { :default => "$two $three FOUR", :desc => "d"},
-          :five   => { :default => nil, :desc => "e" }
+          :five   => { :default => nil, :desc => "e" },
+          :code   => { :default => "", :desc => "my code"}
       Puppet::FileSystem.stubs(:exist?).returns true
     end
 
@@ -612,6 +612,13 @@ describe Puppet::Settings do
       expect(@settings[:two]).to eq("one TWO")
     end
 
+    it "should not interpolate the value of the :code setting" do
+      @code = @settings.setting(:code)
+      @code.expects(:munge).never
+
+      expect(@settings[:code]).to eq("")
+    end
+
     it "should have a run_mode that defaults to user" do
       expect(@settings.preferred_run_mode).to eq(:user)
     end
@@ -658,7 +665,6 @@ describe Puppet::Settings do
 
     it "should not return values outside of its search path" do
       text = "[other]\none = oval\n"
-      file = "/some/file"
       @settings.stubs(:read_file).returns(text)
       @settings.send(:parse_config_files)
       expect(@settings[:one]).to eq("ONE")
@@ -938,7 +944,6 @@ describe Puppet::Settings do
     end
 
     it "does not require the value for a setting without a hook to resolve during global setup" do
-      hook_invoked = false
       @settings.define_settings :section, :can_cause_problems  => {:desc => '' }
 
       @settings.define_settings(:main,

data/spec/unit/ssl/certificate_authority_spec.rb

@@ -46,7 +46,6 @@ describe Puppet::SSL::CertificateAuthority do
         Puppet[:ca] = false
         Puppet.run_mode.stubs(:master?).returns true
 
-        ca = mock('ca')
         Puppet::SSL::CertificateAuthority.expects(:new).never
         expect(Puppet::SSL::CertificateAuthority.instance).to be_nil
       end
@@ -57,7 +56,6 @@ describe Puppet::SSL::CertificateAuthority do
         Puppet[:ca] = true
         Puppet.run_mode.stubs(:master?).returns false
 
-        ca = mock('ca')
         Puppet::SSL::CertificateAuthority.expects(:new).never
         expect(Puppet::SSL::CertificateAuthority.instance).to be_nil
       end
@@ -392,7 +390,7 @@ describe Puppet::SSL::CertificateAuthority do
         Puppet::SSL::CertificateFactory.expects(:build).with do |*args|
           args[2] == @cacert.content
         end.returns @cert.content
-        signed = @ca.sign(@name)
+        @ca.sign(@name)
       end
 
       it "should pass the next serial as the serial number" do
@@ -986,8 +984,6 @@ describe Puppet::SSL::CertificateAuthority do
       end
 
       it "should get the serial number from inventory if no local certificate exists" do
-        real_cert = stub 'real_cert', :serial => 15
-        cert = stub 'cert', :content => real_cert
         Puppet::SSL::Certificate.indirection.expects(:find).with("host").returns nil
 
         @ca.inventory.expects(:serials).with("host").returns [16]
@@ -997,8 +993,6 @@ describe Puppet::SSL::CertificateAuthority do
       end
 
       it "should revoke all serials matching a name" do
-        real_cert = stub 'real_cert', :serial => 15
-        cert = stub 'cert', :content => real_cert
         Puppet::SSL::Certificate.indirection.expects(:find).with("host").returns nil
 
         @ca.inventory.expects(:serials).with("host").returns [16, 20, 25]
@@ -1010,8 +1004,6 @@ describe Puppet::SSL::CertificateAuthority do
       end
 
       it "should raise an error if no certificate match" do
-        real_cert = stub 'real_cert', :serial => 15
-        cert = stub 'cert', :content => real_cert
         Puppet::SSL::Certificate.indirection.expects(:find).with("host").returns nil
 
         @ca.inventory.expects(:serials).with("host").returns []