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

data/spec/unit/ssl/certificate_request_spec.rb

@@ -374,14 +374,13 @@ describe Puppet::SSL::CertificateRequest do
     end
 
     it "should raise an error if neither SHA256/SHA1/SHA512/SHA384/SHA224 are available" do
-      csr = OpenSSL::X509::Request.new
       OpenSSL::Digest.expects(:const_defined?).with("SHA256").returns(false)
       OpenSSL::Digest.expects(:const_defined?).with("SHA1").returns(false)
       OpenSSL::Digest.expects(:const_defined?).with("SHA512").returns(false)
       OpenSSL::Digest.expects(:const_defined?).with("SHA384").returns(false)
       OpenSSL::Digest.expects(:const_defined?).with("SHA224").returns(false)
       expect {
-        signer = Puppet::SSL::CertificateSigner.new
+        Puppet::SSL::CertificateSigner.new
       }.to raise_error(Puppet::Error)
     end
   end

data/spec/unit/transaction/report_spec.rb

@@ -357,6 +357,36 @@ describe Puppet::Transaction::Report do
         expect(metric(:time, "tidy")).to eq(9)
       end
 
+      it "should provide the total time for all time metrics collected" do
+        add_statuses(3, :file) do |status|
+          status.evaluation_time = 1
+        end
+        add_statuses(3, :exec) do |status|
+          status.evaluation_time = 2
+        end
+        add_statuses(3, :tidy) do |status|
+          status.evaluation_time = 3
+        end
+
+        @report.finalize_report
+
+        expect(metric(:time, "total")).to eq(18)
+      end
+
+      it "should accrue times when called for one resource more than once" do
+        @report.add_times :foobar, 50
+        @report.add_times :foobar, 30
+        @report.finalize_report
+        expect(metric(:time, "foobar")).to eq(80)
+      end
+
+      it "should not accrue times when called for one resource more than once when set" do
+        @report.add_times :foobar, 50, false
+        @report.add_times :foobar, 30, false
+        @report.finalize_report
+        expect(metric(:time, "foobar")).to eq(30)
+      end
+
       it "should add any provided times from external sources" do
         @report.add_times :foobar, 50
         @report.finalize_report
@@ -450,6 +480,7 @@ describe Puppet::Transaction::Report do
 
   describe "when producing a summary" do
     before do
+      Benchmark.stubs(:realtime).returns(5.05683418)
       resource = Puppet::Type.type(:notify).new(:name => "testing")
       catalog = Puppet::Resource::Catalog.new
       catalog.add_resource resource
@@ -498,6 +529,15 @@ describe Puppet::Transaction::Report do
         expect(@report.summary).to be_include(main)
       end
     end
+
+    it 'should sort total at the very end of the time metrics' do
+      expect(@report.summary).to match(/
+         Last run: \d+
+   Transaction evaluation: \d+.\d{2}
+            Total: \d+.\d{2}
+Version:
+/)
+    end
   end
 
   describe "when outputting yaml" do
@@ -613,6 +653,7 @@ describe Puppet::Transaction::Report do
       expect(status.line).to eq(expected.line)
       expect(status.resource).to eq(expected.resource)
       expect(status.resource_type).to eq(expected.resource_type)
+      expect(status.provider_used).to eq(expected.provider_used)
       expect(status.containment_path).to eq(expected.containment_path)
       expect(status.evaluation_time).to eq(expected.evaluation_time)
       expect(status.tags).to eq(expected.tags)

data/spec/unit/transaction_spec.rb

@@ -91,7 +91,7 @@ describe Puppet::Transaction do
 
       report.expects(:add_times).with(:config_retrieval, 5)
 
-      transaction = Puppet::Transaction.new(catalog, report, nil)
+      Puppet::Transaction.new(catalog, report, nil)
     end
   end
 

data/spec/unit/type/exec_spec.rb

@@ -12,7 +12,7 @@ describe Puppet::Type.type(:exec) do
     output = Puppet::Util::Execution::ProcessOutput.new(output, exitstatus)
     tries  = rest[:tries] || 1
 
-    args = {
+    type_args = {
       :name      => command,
       :path      => @example_path,
       :logoutput => false,
@@ -20,15 +20,13 @@ describe Puppet::Type.type(:exec) do
       :returns   => 0
     }.merge(rest)
 
-    exec = Puppet::Type.type(:exec).new(args)
+    exec = Puppet::Type.type(:exec).new(type_args)
 
-    status = stub "process", :exitstatus => exitstatus
-    Puppet::Util::Execution.expects(:execute).times(tries).
-      with() { |*args|
-        args[0] == command &&
-        args[1][:override_locale] == false &&
-        args[1].has_key?(:custom_environment)
-      }.returns(output)
+    Puppet::Util::Execution.expects(:execute).times(tries).with() do |*args|
+      args[0] == command &&
+      args[1][:override_locale] == false &&
+      args[1].has_key?(:custom_environment)
+    end.returns(output)
 
     return exec
   end

data/spec/unit/type/file/selinux_spec.rb

@@ -75,7 +75,6 @@ require 'spec_helper'
     end
 
     it "should be able to set a new context" do
-      stat = stub 'stat', :ftype => "foo"
       @sel.should = %w{newone}
       @sel.expects(:set_selinux_context).with(@path, ["newone"], param)
       @sel.sync

data/spec/unit/type/file_spec.rb

@@ -384,8 +384,9 @@ describe Puppet::Type.type(:file) do
   describe "#mark_children_for_purging" do
     it "should set each child's ensure to absent" do
       paths = %w[foo bar baz]
-      children = paths.inject({}) do |children,child|
-        children.merge child => described_class.new(:path => File.join(path, child), :ensure => :present)
+      children = {}
+      paths.each do |child|
+        children[child] = described_class.new(:path => File.join(path, child), :ensure => :present)
       end
 
       file.mark_children_for_purging(children)
@@ -1096,7 +1097,7 @@ describe Puppet::Type.type(:file) do
     end
 
     it "should cache the stat instance" do
-      expect(file.stat).to equal(file.stat)
+      expect(file.stat.object_id).to eql(file.stat.object_id)
     end
   end
 

data/spec/unit/type/k5login_spec.rb

@@ -77,16 +77,37 @@ describe Puppet::Type.type(:k5login), :unless => Puppet.features.microsoft_windo
           end
         end
 
-        context "with selinux" do
-          subject { resource(:content => "daniel@EXAMPLE.COM\n",).retrieve }
-          it "should return correct values based on SELinux state" do
-            Puppet::Type::K5login::ProviderK5login.any_instance.stubs(:selinux_support?).returns true
-            Puppet::Type::K5login::ProviderK5login.any_instance.stubs(:get_selinux_current_context).returns "user_u:role_r:type_t:s0"
-
-            expect(subject[:seluser]).to eq("user_u")
-            expect(subject[:selrole]).to eq("role_r")
-            expect(subject[:seltype]).to eq("type_t")
-            expect(subject[:selrange]).to eq("s0")
+        [:seluser, :selrole, :seltype, :selrange].each do |param|
+          property = described_class.attrclass(param)
+          context param.to_s do
+            let(:sel_param) { property.new :resource => resource }
+
+            context "with selinux" do
+              it "should return correct values based on SELinux state" do
+                sel_param.stubs(:debug)
+                expectedresult = case param
+                  when :seluser; "user_u"
+                  when :selrole; "object_r"
+                  when :seltype; "krb5_home_t"
+                  when :selrange; "s0"
+                end
+                expect(sel_param.default).to eq(expectedresult)
+              end
+            end
+
+            context 'without selinux' do
+              it 'should not try to determine the initial state' do
+                Puppet::Type::K5login::ProviderK5login.any_instance.stubs(:selinux_support?).returns false
+
+                expect(subject[:selrole]).to be_nil
+              end
+
+              it "should do nothing for safe_insync? if no SELinux support" do
+                sel_param.should = 'newcontext'
+                sel_param.expects(:selinux_support?).returns false
+                expect(sel_param.safe_insync?('oldcontext')).to eq(true)
+              end
+            end
           end
         end
 
@@ -131,6 +152,54 @@ describe Puppet::Type.type(:k5login), :unless => Puppet.features.microsoft_windo
           end
         end
       end
+
+      context "#stat" do
+        let(:file) { described_class.new(:path => path) }
+
+        it "should return nil if the file does not exist" do
+          file[:path] = make_absolute('/foo/bar/baz/non-existent')
+
+          expect(file.stat).to be_nil
+        end
+
+        it "should return nil if the file cannot be stat'ed" do
+          dir = tmpfile('link_test_dir')
+          child = File.join(dir, 'some_file')
+
+          # Note: we aren't creating the file for this test. If the user is
+          # running these tests as root, they will be able to access the
+          # directory. In that case, this test will still succeed, not because
+          # we cannot stat the file, but because the file does not exist.
+          Dir.mkdir(dir)
+          begin
+            File.chmod(0, dir)
+
+            file[:path] = child
+
+            expect(file.stat).to be_nil
+          ensure
+            # chmod it back so we can clean it up
+            File.chmod(0777, dir)
+          end
+        end
+
+        it "should return nil if parts of path are not directories" do
+          regular_file = tmpfile('ENOTDIR_test')
+          FileUtils.touch(regular_file)
+          impossible_child = File.join(regular_file, 'some_file')
+
+          file[:path] = impossible_child
+          expect(file.stat).to be_nil
+        end
+
+        it "should return the stat instance" do
+          expect(file.stat).to be_a(File::Stat)
+        end
+
+        it "should cache the stat instance" do
+          expect(file.stat.object_id).to eql(file.stat.object_id)
+        end
+      end
     end
   end
 end

data/spec/unit/type/mount_spec.rb

@@ -518,7 +518,7 @@ describe Puppet::Type.type(:mount), :unless => Puppet.features.microsoft_windows
     def run_in_catalog(*resources)
       Puppet::Util::Storage.stubs(:store)
       catalog = Puppet::Resource::Catalog.new
-      catalog.add_resource *resources
+      catalog.add_resource(*resources)
       catalog.apply
     end
 

data/spec/unit/type/nagios_spec.rb

@@ -100,7 +100,7 @@ EOL
   it "should parse without error" do
     parser =  Nagios::Parser.new
     expect {
-      results = parser.parse(NONESCAPED_SEMICOLON_COMMENT)
+      parser.parse(NONESCAPED_SEMICOLON_COMMENT)
     }.to_not raise_error
   end
 
@@ -117,14 +117,14 @@ EOL
   it "should raise an error when an incorrect object definition is present" do
     parser =  Nagios::Parser.new
     expect {
-      results = parser.parse(UNKNOWN_NAGIOS_OBJECT_DEFINITION)
+      parser.parse(UNKNOWN_NAGIOS_OBJECT_DEFINITION)
     }.to raise_error Nagios::Base::UnknownNagiosType
   end
 
   it "should raise an error when syntax is not correct" do
     parser =  Nagios::Parser.new
     expect {
-      results = parser.parse(MISSING_CLOSING_CURLY_BRACKET)
+      parser.parse(MISSING_CLOSING_CURLY_BRACKET)
     }.to raise_error Nagios::Parser::SyntaxError
   end
 
@@ -132,7 +132,7 @@ EOL
     it "should not throw an exception" do
       parser =  Nagios::Parser.new
       expect {
-        results = parser.parse(ESCAPED_SEMICOLON)
+        parser.parse(ESCAPED_SEMICOLON)
       }.to_not raise_error
     end
 
@@ -154,7 +154,7 @@ EOL
     it "should not throw an exception" do
       parser =  Nagios::Parser.new
       expect {
-        results = parser.parse(POUND_SIGN_HASH_SYMBOL_NOT_IN_FIRST_COLUMN)
+        parser.parse(POUND_SIGN_HASH_SYMBOL_NOT_IN_FIRST_COLUMN)
       }.to_not raise_error
     end
 
@@ -177,7 +177,7 @@ EOL
     it "should not throw an exception" do
       parser =  Nagios::Parser.new
       expect {
-        results = parser.parse(ANOTHER_ESCAPED_SEMICOLON)
+        parser.parse(ANOTHER_ESCAPED_SEMICOLON)
       }.to_not raise_error
     end
 

data/spec/unit/type/user_spec.rb

@@ -406,7 +406,7 @@ describe Puppet::Type.type(:user) do
       testuser = described_class.new(:name => "testuser", :roles => ['testrole'] )
       testrole = described_class.new(:name => "testrole")
 
-      config = Puppet::Resource::Catalog.new :testing do |conf|
+      Puppet::Resource::Catalog.new :testing do |conf|
         [testuser, testrole].each { |resource| conf.add_resource resource }
       end
       Puppet::Type::User::ProviderDirectoryservice.stubs(:get_macosx_version_major).returns "10.5"

data/spec/unit/type/yumrepo_spec.rb

@@ -399,5 +399,23 @@ describe Puppet::Type.type(:yumrepo) do
       it_behaves_like "a yumrepo parameter that can be absent", :deltarpm_metadata_percentage
       it_behaves_like "a yumrepo parameter that expects a natural value", :deltarpm_metadata_percentage
     end
+
+    describe "username" do
+      it_behaves_like "a yumrepo parameter that can be absent", :username
+    end
+
+    describe "password" do
+      it_behaves_like "a yumrepo parameter that can be absent", :password
+
+      it "redacts password information from the logs" do
+        resource = described_class.new(:name => 'puppetlabs', :password => 'top secret')
+        harness = Puppet::Transaction::ResourceHarness.new(Puppet::Transaction.new(Puppet::Resource::Catalog.new, nil, nil))
+        harness.evaluate(resource)
+        resource[:password] = 'super classified'
+        status = harness.evaluate(resource)
+        sync_event = status.events[0]
+        expect(sync_event.message).to eq 'changed [redacted] to [redacted]'
+      end
+    end
   end
 end

data/spec/unit/type/zfs_spec.rb

@@ -35,7 +35,7 @@ describe zfs do
     foo_bar_baz_zfs = Puppet::Type.type(:zfs).new(:name => "foo/bar/baz")
     foo_bar_baz_buz_zfs = Puppet::Type.type(:zfs).new(:name => "foo/bar/baz/buz")
 
-    config = Puppet::Resource::Catalog.new :testing do |conf|
+    Puppet::Resource::Catalog.new :testing do |conf|
       [foo_pool, foo_bar_zfs, foo_bar_baz_zfs, foo_bar_baz_buz_zfs].each { |resource| conf.add_resource resource }
     end
 

data/spec/unit/type_spec.rb

@@ -266,7 +266,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
 
     it "should have documentation for the 'provider' parameter if there are providers" do
       @type.provide(:test_provider)
-      expect(@type.paramdoc(:provider)).to match(/`provider_test_type`[\s\r]+resource/)
+      expect(@type.paramdoc(:provider)).to match(/`provider_test_type`[\s]+resource/)
     end
 
     it "should not have documentation for the 'provider' parameter if there are no providers" do
@@ -343,7 +343,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
       end
 
       it "should be registered as a provider of the child type" do
-        child_provider = @type.provide(:child_provider, :parent => @parent_provider)
+        @type.provide(:child_provider, :parent => @parent_provider)
         expect(@type.providers).to include(:child_provider)
         expect(@parent_type.providers).not_to include(:child_provider)
       end
@@ -369,14 +369,14 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
 
   context "autorelations" do
     before :each do
-      type = Puppet::Type.newtype(:autorelation_one) do
+      Puppet::Type.newtype(:autorelation_one) do
         newparam(:name) { isnamevar }
       end
     end
 
     describe "when building autorelations" do
       it "should be able to autorequire resources" do
-        type = Puppet::Type.newtype(:autorelation_two) do
+        Puppet::Type.newtype(:autorelation_two) do
           newparam(:name) { isnamevar }
           autorequire(:autorelation_one) { ['foo'] }
         end
@@ -394,7 +394,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
       end
 
       it 'should not fail autorequire contains undef entries' do
-        type = Puppet::Type.newtype(:autorelation_two) do
+        Puppet::Type.newtype(:autorelation_two) do
           newparam(:name) { isnamevar }
           autorequire(:autorelation_one) { [nil, 'foo'] }
         end
@@ -412,7 +412,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
       end
 
       it "should be able to autosubscribe resources" do
-        type = Puppet::Type.newtype(:autorelation_two) do
+        Puppet::Type.newtype(:autorelation_two) do
           newparam(:name) { isnamevar }
           autosubscribe(:autorelation_one) { ['foo'] }
         end
@@ -430,7 +430,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
       end
 
       it 'should not fail if autosubscribe contains undef entries' do
-        type = Puppet::Type.newtype(:autorelation_two) do
+        Puppet::Type.newtype(:autorelation_two) do
           newparam(:name) { isnamevar }
           autosubscribe(:autorelation_one) { [nil, 'foo'] }
         end
@@ -448,7 +448,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
       end
 
       it "should be able to autobefore resources" do
-        type = Puppet::Type.newtype(:autorelation_two) do
+        Puppet::Type.newtype(:autorelation_two) do
           newparam(:name) { isnamevar }
           autobefore(:autorelation_one) { ['foo'] }
         end
@@ -466,7 +466,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
       end
 
       it "should not fail when autobefore contains undef entries" do
-        type = Puppet::Type.newtype(:autorelation_two) do
+        Puppet::Type.newtype(:autorelation_two) do
           newparam(:name) { isnamevar }
           autobefore(:autorelation_one) { [nil, 'foo'] }
         end
@@ -484,7 +484,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
       end
 
       it "should be able to autonotify resources" do
-        type = Puppet::Type.newtype(:autorelation_two) do
+        Puppet::Type.newtype(:autorelation_two) do
           newparam(:name) { isnamevar }
           autonotify(:autorelation_one) { ['foo'] }
         end
@@ -502,7 +502,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
       end
 
       it 'should not fail if autonotify contains undef entries' do
-        type = Puppet::Type.newtype(:autorelation_two) do
+        Puppet::Type.newtype(:autorelation_two) do
           newparam(:name) { isnamevar }
           autonotify(:autorelation_one) { [nil, 'foo'] }
         end
@@ -1249,7 +1249,6 @@ describe Puppet::Type.metaparamclass(:audit) do
 
     it "should handle proprieties correctly" do
       # Order of assignment is significant in this test.
-      props = {}
       [:one, :two, :three].each {|prop| type.newproperty(prop) {} }
       instance = type.new(:name => "test")
 
@@ -1272,9 +1271,9 @@ describe Puppet::Type.metaparamclass(:audit) do
       type.feature :feature1, "one"
       type.feature :feature2, "two"
 
-      none = type.newproperty(:none) {}
-      one  = type.newproperty(:one, :required_features => :feature1) {}
-      two  = type.newproperty(:two, :required_features => [:feature1, :feature2]) {}
+      type.newproperty(:none) {}
+      type.newproperty(:one, :required_features => :feature1) {}
+      type.newproperty(:two, :required_features => [:feature1, :feature2]) {}
 
       nope  = type.provide(:nope)  {}
       maybe = type.provide(:maybe) { has_features :feature1 }