puppet 5.0.0 → 6.0.0

data/spec/unit/transaction_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'matchers/include_in_order'
 require 'puppet_spec/compiler'
@@ -17,13 +16,13 @@ describe Puppet::Transaction do
   end
 
   def transaction_with_resource(resource)
-    transaction = Puppet::Transaction.new(catalog_with_resource(resource), nil, Puppet::Graph::RandomPrioritizer.new)
+    transaction = Puppet::Transaction.new(catalog_with_resource(resource), nil, Puppet::Graph::SequentialPrioritizer.new)
     transaction
   end
 
   before do
     @basepath = make_absolute("/what/ever")
-    @transaction = Puppet::Transaction.new(Puppet::Resource::Catalog.new, nil, Puppet::Graph::RandomPrioritizer.new)
+    @transaction = Puppet::Transaction.new(Puppet::Resource::Catalog.new, nil, Puppet::Graph::SequentialPrioritizer.new)
   end
 
   it "should be able to look resource status up by resource reference" do
@@ -91,7 +90,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
 
@@ -133,6 +132,32 @@ describe Puppet::Transaction do
     end
   end
 
+  describe "when evaluating a skipped resource for corrective change it" do
+    before :each do
+      # Enable persistence during tests
+      Puppet::Transaction::Persistence.any_instance.stubs(:enabled?).returns(true)
+    end
+
+    it "should persist in the transactionstore" do
+      Puppet[:transactionstorefile] = tmpfile('persistence_test')
+
+      resource = Puppet::Type.type(:notify).new :title => "foobar"
+      transaction = transaction_with_resource(resource)
+      transaction.evaluate
+      expect(transaction.resource_status(resource)).to be_changed
+
+      transaction = transaction_with_resource(resource)
+      transaction.expects(:skip?).with(resource).returns true
+      transaction.event_manager.expects(:process_events).with(resource).never
+      transaction.evaluate
+      expect(transaction.resource_status(resource)).to be_skipped
+
+      persistence = Puppet::Transaction::Persistence.new
+      persistence.load
+      expect(persistence.get_system_value(resource.ref, "message")).to eq(["foobar"])
+    end
+  end
+
   describe "when applying a resource" do
     before do
       @catalog = Puppet::Resource::Catalog.new
@@ -140,7 +165,7 @@ describe Puppet::Transaction do
       @catalog.add_resource(@resource)
       @status = Puppet::Resource::Status.new(@resource)
 
-      @transaction = Puppet::Transaction.new(@catalog, nil, Puppet::Graph::RandomPrioritizer.new)
+      @transaction = Puppet::Transaction.new(@catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
       @transaction.event_manager.stubs(:queue_events)
     end
 
@@ -297,7 +322,7 @@ describe Puppet::Transaction do
 
   describe "when generating resources before traversal" do
     let(:catalog) { Puppet::Resource::Catalog.new }
-    let(:transaction) { Puppet::Transaction.new(catalog, nil, Puppet::Graph::RandomPrioritizer.new) }
+    let(:transaction) { Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new) }
     let(:generator) { Puppet::Type.type(:notify).new :title => "generator" }
     let(:generated) do
       %w[a b c].map { |name| Puppet::Type.type(:notify).new(:name => name) }
@@ -336,7 +361,7 @@ describe Puppet::Transaction do
 
   describe "after resource traversal" do
     let(:catalog) { Puppet::Resource::Catalog.new }
-    let(:prioritizer) { Puppet::Graph::RandomPrioritizer.new }
+    let(:prioritizer) { Puppet::Graph::SequentialPrioritizer.new }
     let(:report) { Puppet::Transaction::Report.new }
     let(:transaction) { Puppet::Transaction.new(catalog, report, prioritizer) }
     let(:generator) { Puppet::Transaction::AdditionalResourceGenerator.new(catalog, nil, prioritizer) }
@@ -502,7 +527,7 @@ describe Puppet::Transaction do
       @resource = Puppet::Type.type(:notify).new :name => "foo"
       @catalog = Puppet::Resource::Catalog.new
       @catalog.add_resource(@resource)
-      @transaction = Puppet::Transaction.new(@catalog, nil, Puppet::Graph::RandomPrioritizer.new)
+      @transaction = Puppet::Transaction.new(@catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
     end
 
     it "should always schedule resources if 'ignoreschedules' is set" do
@@ -523,10 +548,11 @@ describe Puppet::Transaction do
   describe "when prefetching" do
     let(:catalog) { Puppet::Resource::Catalog.new }
     let(:transaction) { Puppet::Transaction.new(catalog, nil, nil) }
-    let(:resource) { Puppet::Type.type(:sshkey).new :title => "foo", :name => "bar", :type => :dsa, :key => "eh", :provider => :parsed }
-    let(:resource2) { Puppet::Type.type(:package).new :title => "blah", :provider => "apt" }
+    let(:resource) { Puppet::Type.type(:package).new :title => "foo", :name => "bar", :provider => :pkgng }
+    let(:resource2) { Puppet::Type.type(:package).new :title => "blah", :provider => :apt }
 
     before :each do
+      resource.stubs(:suitable?).returns(true)
       catalog.add_resource resource
       catalog.add_resource resource2
     end
@@ -538,7 +564,7 @@ describe Puppet::Transaction do
     end
 
     it "should not prefetch a provider which has already been prefetched" do
-      transaction.prefetched_providers[:sshkey][:parsed] = true
+      transaction.prefetched_providers[:package][:pkgng] = true
 
       resource.provider.class.expects(:prefetch).never
 
@@ -550,26 +576,118 @@ describe Puppet::Transaction do
 
       transaction.prefetch_if_necessary(resource)
 
-      expect(transaction.prefetched_providers[:sshkey][:parsed]).to be_truthy
+      expect(transaction.prefetched_providers[:package][:pkgng]).to be_truthy
     end
 
     it "should prefetch resources without a provider if prefetching the default provider" do
-      other = Puppet::Type.type(:sshkey).new :name => "other"
-
+      other = Puppet::Type.type(:package).new :name => "other"
       other.instance_variable_set(:@provider, nil)
 
       catalog.add_resource other
 
+      resource.class.stubs(:defaultprovider).returns(resource.provider.class)
       resource.provider.class.expects(:prefetch).with('bar' => resource, 'other' => other)
 
       transaction.prefetch_if_necessary(resource)
     end
+
+    it "should not prefetch a provider which has failed" do
+      transaction.prefetch_failed_providers[:package][:pkgng] = true
+
+      resource.provider.class.expects(:prefetch).never
+
+      transaction.prefetch_if_necessary(resource)
+    end
+
+    describe "and prefetching fails" do
+      before :each do
+        resource.provider.class.expects(:prefetch).raises(Puppet::Error, "message")
+      end
+
+      context "without future_features flag" do
+        before :each do
+          Puppet.settings[:future_features] = false
+        end
+
+        it "should not rescue prefetch executions" do
+          expect { transaction.prefetch_if_necessary(resource) }.to raise_error(Puppet::Error)
+        end
+      end
+
+      context "with future_features flag" do
+        before :each do
+          Puppet.settings[:future_features] = true
+        end
+
+        it "should rescue prefetch executions" do
+          transaction.prefetch_if_necessary(resource)
+
+          expect(transaction.prefetched_providers[:package][:pkgng]).to be_truthy
+        end
+
+        it "should mark resources as failed", :unless => RUBY_PLATFORM == 'java' do
+          transaction.evaluate
+
+          expect(transaction.resource_status(resource).failed?).to be_truthy
+        end
+
+        it "should mark a provider that has failed prefetch" do
+          transaction.prefetch_if_necessary(resource)
+
+          expect(transaction.prefetch_failed_providers[:package][:pkgng]).to be_truthy
+        end
+
+        describe "and new resources are generated" do
+          let(:generator) { Puppet::Type.type(:notify).new :title => "generator" }
+          let(:generated) do
+            %w[a b c].map { |name| Puppet::Type.type(:package).new :title => "foo", :name => name, :provider => :apt }
+          end
+
+          before :each do
+            catalog.add_resource generator
+            generator.stubs(:generate).returns generated
+            catalog.stubs(:container_of).returns generator
+          end
+
+          it "should not evaluate resources with a failed provider, even if the prefetch is rescued" do
+            #Only the generator resource should be applied, all the other resources are failed, and skipped.
+            catalog.remove_resource resource2
+            transaction.expects(:apply).once
+
+            transaction.evaluate
+          end
+
+          it "should not fail other resources added after the failing resource", :unless => RUBY_PLATFORM == 'java' do
+            new_resource = Puppet::Type.type(:notify).new :name => "baz"
+            catalog.add_resource(new_resource)
+
+            transaction.evaluate
+
+            expect(transaction.resource_status(new_resource).failed?).to be_falsey
+          end
+
+          it "should fail other resources that require the failing resource" do
+            new_resource = Puppet::Type.type(:notify).new(:name => "baz", :require => resource)
+            catalog.add_resource(new_resource)
+
+            catalog.remove_resource resource2
+            transaction.expects(:apply).once
+
+            transaction.evaluate
+
+            expect(transaction.resource_status(resource).failed?).to be_truthy
+            expect(transaction.resource_status(new_resource).dependency_failed?).to be_truthy
+            expect(transaction.skip?(new_resource)).to be_truthy
+          end
+        end
+      end
+    end
   end
 
   describe "during teardown" do
     let(:catalog) { Puppet::Resource::Catalog.new }
     let(:transaction) do
-      Puppet::Transaction.new(catalog, nil, Puppet::Graph::RandomPrioritizer.new)
+      Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
     end
 
     let(:teardown_type) do
@@ -637,7 +755,7 @@ describe Puppet::Transaction do
   describe 'when checking application run state' do
     before do
       @catalog = Puppet::Resource::Catalog.new
-      @transaction = Puppet::Transaction.new(@catalog, nil, Puppet::Graph::RandomPrioritizer.new)
+      @transaction = Puppet::Transaction.new(@catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
     end
 
     context "when stop is requested" do

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
@@ -42,7 +40,7 @@ describe Puppet::Type.type(:exec) do
   describe "when not stubbing the provider" do
     before do
       path = tmpdir('path')
-      ext = Puppet.features.microsoft_windows? ? '.exe' : ''
+      ext = Puppet::Util::Platform.windows? ? '.exe' : ''
       true_cmd = File.join(path, "true#{ext}")
       false_cmd = File.join(path, "false#{ext}")
 
@@ -259,7 +257,7 @@ describe Puppet::Type.type(:exec) do
       end
     end
 
-    describe "on Windows systems", :if => Puppet.features.microsoft_windows? do
+    describe "on Windows systems", :if => Puppet::Util::Platform.windows? do
       before :each do
         Puppet.features.stubs(:root?).returns(true)
       end
@@ -439,14 +437,14 @@ describe Puppet::Type.type(:exec) do
           Puppet::Type.type(:exec).new(:name => "#{ruby_path} -e 'sleep 1'", :timeout => '0.1')
         end
 
-        context 'on POSIX', :unless => Puppet.features.microsoft_windows? do
+        context 'on POSIX', :unless => Puppet::Util::Platform.windows? || RUBY_PLATFORM == 'java' do
           it 'sends a SIGTERM and raises a Puppet::Error' do
             Process.expects(:kill).at_least_once
             expect { subject.refresh }.to raise_error Puppet::Error, "Command exceeded timeout"
           end
         end
 
-        context 'on Windows', :if => Puppet.features.microsoft_windows? do
+        context 'on Windows', :if => Puppet::Util::Platform.windows? do
           it 'raises a Puppet::Error' do
             expect { subject.refresh }.to raise_error Puppet::Error, "Command exceeded timeout"
           end

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

@@ -4,7 +4,7 @@ require 'spec_helper'
 checksum = Puppet::Type.type(:file).attrclass(:checksum)
 describe checksum do
   before do
-    @path = Puppet.features.microsoft_windows? ? "c:/foo/bar" : "/foo/bar"
+    @path = Puppet::Util::Platform.windows? ? "c:/foo/bar" : "/foo/bar"
     @resource = Puppet::Type.type(:file).new :path => @path
     @checksum = @resource.parameter(:checksum)
   end
@@ -36,6 +36,18 @@ describe checksum do
     expect(@checksum.sum("foobar")).to eq("{sha256}#{sum}")
   end
 
+  it "when using digest_algorithm 'sha512' should return the summed contents with a checksum label" do
+    sum = Digest::SHA512.hexdigest("foobar")
+    @resource[:checksum] = :sha512
+    expect(@checksum.sum("foobar")).to eq("{sha512}#{sum}")
+  end
+
+  it "when using digest_algorithm 'sha384' should return the summed contents with a checksum label" do
+    sum = Digest::SHA384.hexdigest("foobar")
+    @resource[:checksum] = :sha384
+    expect(@checksum.sum("foobar")).to eq("{sha384}#{sum}")
+  end
+
   it "should use :md5 as its default type" do
     expect(@checksum.default).to eq(:md5)
   end
@@ -82,4 +94,12 @@ describe checksum do
     Puppet.settings[:supported_checksum_types] = values
     expect(Puppet.settings[:supported_checksum_types]).to eq(values)
   end
+
+  it 'rejects md5 checksums in FIPS mode' do
+    Puppet::Util::Platform.stubs(:fips_enabled?).returns true
+    expect {
+      @resource[:checksum] = :md5
+    }.to raise_error(Puppet::ResourceError,
+                     /Parameter checksum failed.* MD5 is not supported in FIPS mode/)
+  end
 end

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

@@ -41,6 +41,11 @@ describe Puppet::Type.type(:file).attrclass(:content), :uses_checksums => true d
   describe "when setting the desired content" do
     let(:content) { described_class.new(:resource => resource) }
 
+    before do
+      Puppet::Type.type(:file).any_instance.stubs(:file).returns('my/file.pp')
+      Puppet::Type.type(:file).any_instance.stubs(:line).returns 5
+    end
+
     it "should make the actual content available via an attribute" do
       content.should = "this is some content"
 
@@ -72,7 +77,7 @@ describe Puppet::Type.type(:file).attrclass(:content), :uses_checksums => true d
       end
     end
 
-    it "should convert the value to ASCII-8BIT", :if => "".respond_to?(:encode) do
+    it "should convert the value to ASCII-8BIT" do
       content.should= "Let's make a \u{2603}"
 
       expect(content.actual_content).to eq("Let's make a \xE2\x98\x83".force_encoding(Encoding::ASCII_8BIT))
@@ -221,6 +226,7 @@ describe Puppet::Type.type(:file).attrclass(:content), :uses_checksums => true d
         describe "with #{compare} target #{time_stat} compared to source" do
           before do
             resource[:checksum] = time_stat
+            resource[:source] = make_absolute('/temp/foo')
             content.should = "{#{time_stat}}#{saved_time}"
           end
 
@@ -237,6 +243,7 @@ describe Puppet::Type.type(:file).attrclass(:content), :uses_checksums => true d
       describe "with #{time_stat}" do
         before do
           resource[:checksum] = time_stat
+          resource[:source] = make_absolute('/temp/foo')
         end
 
         it "should not be insync if trying to create it" do
@@ -372,6 +379,11 @@ describe Puppet::Type.type(:file).attrclass(:content), :uses_checksums => true d
 
     let(:fh) { File.open(filename, 'wb') }
 
+    before do
+      Puppet::Type.type(:file).any_instance.stubs(:file).returns('my/file.pp')
+      Puppet::Type.type(:file).any_instance.stubs(:line).returns 5
+    end
+
     it "should attempt to read from the filebucket if no actual content nor source exists" do
       content.should = "{md5}foo"
       content.resource.bucket.class.any_instance.stubs(:getfile).returns "foo"

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/source_spec.rb

@@ -42,14 +42,14 @@ describe Puppet::Type.type(:file).attrclass(:source), :uses_checksums => true do
       expect(lambda { resource[:source] = %w{ftp://foo/bar} }).to raise_error(Puppet::Error, /Cannot use URLs of type 'ftp' as source for fileserving/)
     end
 
-    it "should strip trailing forward slashes", :unless => Puppet.features.microsoft_windows? do
+    it "should strip trailing forward slashes", :unless => Puppet::Util::Platform.windows? do
       resource[:source] = "/foo/bar\\//"
-      expect(resource[:source]).to eq(%w{file:/foo/bar\\})
+      expect(resource[:source].first).to match(%r{/foo/bar\\$})
     end
 
-    it "should strip trailing forward and backslashes", :if => Puppet.features.microsoft_windows? do
+    it "should strip trailing forward and backslashes", :if => Puppet::Util::Platform.windows? do
       resource[:source] = "X:/foo/bar\\//"
-      expect(resource[:source]).to eq(%w{file:/X:/foo/bar})
+      expect(resource[:source].first).to match(/(file\:|file\:\/\/)\/X:\/foo\/bar$/)
     end
 
     it "should accept an array of sources" do
@@ -186,6 +186,12 @@ describe Puppet::Type.type(:file).attrclass(:source), :uses_checksums => true do
   end
 
   describe "when copying the source values" do
+
+    before do
+      Puppet::Type.type(:file).any_instance.stubs(:file).returns('my/file.pp')
+      Puppet::Type.type(:file).any_instance.stubs(:line).returns 5
+    end
+
     before :each do
       @resource = Puppet::Type.type(:file).new :path => @foobar
 
@@ -200,7 +206,7 @@ describe Puppet::Type.type(:file).attrclass(:source), :uses_checksums => true do
       @metadata.stubs(:mode).returns 0173
       @resource[:source_permissions] = :use
       if Puppet::Util::Platform.windows?
-        expect { @source.copy_source_values }.to raise_error("Should not have tried to use source owner/mode/group on Windows")
+        expect { @source.copy_source_values }.to raise_error("Should not have tried to use source owner/mode/group on Windows (file: my/file.pp, line: 5)")
       else
         expect { @source.copy_source_values }.not_to raise_error
       end
@@ -210,7 +216,7 @@ describe Puppet::Type.type(:file).attrclass(:source), :uses_checksums => true do
       @metadata.stubs(:mode).returns "173"
       @resource[:source_permissions] = :use
       if Puppet::Util::Platform.windows?
-        expect { @source.copy_source_values }.to raise_error("Should not have tried to use source owner/mode/group on Windows")
+        expect { @source.copy_source_values }.to raise_error("Should not have tried to use source owner/mode/group on Windows (file: my/file.pp, line: 5)")
       else
         expect { @source.copy_source_values }.not_to raise_error
       end
@@ -240,7 +246,7 @@ describe Puppet::Type.type(:file).attrclass(:source), :uses_checksums => true do
     describe "and the source is a file" do
       before do
         @metadata.stubs(:ftype).returns "file"
-        Puppet.features.stubs(:microsoft_windows?).returns false
+        Puppet::Util::Platform.stubs(:windows?).returns false
       end
 
       context "when source_permissions is `use`" do
@@ -403,7 +409,7 @@ describe Puppet::Type.type(:file).attrclass(:source), :uses_checksums => true do
 
     describe "and the source is a link" do
       before do
-        Puppet.features.stubs(:microsoft_windows?).returns false
+        Puppet::Util::Platform.stubs(:windows?).returns false
       end
 
       it "should set the target to the link destination" do
@@ -450,7 +456,7 @@ describe Puppet::Type.type(:file).attrclass(:source), :uses_checksums => true do
         end
       end
 
-      describe "on Windows systems", :if => Puppet.features.microsoft_windows? do
+      describe "on Windows systems", :if => Puppet::Util::Platform.windows? do
         ['', "file:/", "file:///"].each do |prefix|
           it "should be local with prefix '#{prefix}'" do
             resource[:source] = "#{prefix}#{sourcepath}"

data/spec/unit/type/file_spec.rb

@@ -51,7 +51,7 @@ describe Puppet::Type.type(:file) do
       end
     end
 
-    describe "on Windows systems", :if => Puppet.features.microsoft_windows? do
+    describe "on Windows systems", :if => Puppet::Util::Platform.windows? do
       it "should remove trailing slashes" do
         file[:path] = "X:/foo/bar/baz/"
         expect(file[:path]).to eq("X:/foo/bar/baz")
@@ -76,7 +76,7 @@ describe Puppet::Type.type(:file) do
         expect { file[:path] = "X:" }.to raise_error(/File paths must be fully qualified/)
       end
 
-      describe "when using UNC filenames", :if => Puppet.features.microsoft_windows? do
+      describe "when using UNC filenames", :if => Puppet::Util::Platform.windows? do
         it "should remove trailing slashes" do
           file[:path] = "//localhost/foo/bar/baz/"
           expect(file[:path]).to eq("//localhost/foo/bar/baz")
@@ -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)
@@ -893,26 +894,31 @@ describe Puppet::Type.type(:file) do
     end
 
     it "should fail if it can't backup the file" do
+      # Default: file[:backup] = true
       file.stubs(:stat).returns stub('stat', :ftype => 'file')
       file.stubs(:perform_backup).returns false
 
-      expect { file.remove_existing(:file) }.to raise_error(Puppet::Error, /Could not back up; will not replace/)
+      expect { file.remove_existing(:file) }.to raise_error(Puppet::Error, /Could not back up; will not remove/)
     end
 
     describe "backing up directories" do
-      it "should not backup directories if force is false" do
+      it "should not backup directories if backup is true and force is false" do
+        # Default: file[:backup] = true
         file[:force] = false
         file.stubs(:stat).returns stub('stat', :ftype => 'directory')
+
         file.expects(:perform_backup).never
+        file.expects(:warning).with("Could not back up file of type directory")
         expect(file.remove_existing(:file)).to eq(false)
       end
 
-      it "should backup directories if force is true" do
+      it "should backup directories if backup is true and force is true" do
+        # Default: file[:backup] = true
         file[:force] = true
-        FileUtils.expects(:rmtree).with(file[:path])
-
         file.stubs(:stat).returns stub('stat', :ftype => 'directory')
-        file.expects(:perform_backup).once.returns(true)
+
+        FileUtils.expects(:rmtree).with(file[:path])
+        file.expects(:perform_backup).returns(true)
 
         expect(file.remove_existing(:file)).to eq(true)
       end
@@ -924,18 +930,17 @@ describe Puppet::Type.type(:file) do
       expect(file.remove_existing(:file)).to eq(false)
     end
 
-    it "should not remove directories and should not invalidate the stat unless force is set" do
+    it "should not remove directories and should not invalidate the stat unless force is true" do
+      file[:force] = false
       # Actually call stat to set @needs_stat to nil
       file.stat
       file.stubs(:stat).returns stub('stat', :ftype => 'directory')
 
-      file.remove_existing(:file)
-
       expect(file.instance_variable_get(:@stat)).to eq(nil)
-      expect(@logs).to be_any {|log| log.level == :notice and log.message =~ /Not removing directory; use 'force' to override/}
     end
 
-    it "should remove a directory if force is set" do
+    it "should remove a directory if backup is true and force is true" do
+      # Default: file[:backup] = true
       file[:force] = true
       file.stubs(:stat).returns stub('stat', :ftype => 'directory')
 
@@ -966,10 +971,11 @@ describe Puppet::Type.type(:file) do
       expect(Puppet::FileSystem.exist?(file[:path])).to eq(false)
     end
 
-    it "should fail if the file is not a file, link, or directory" do
-      file.stubs(:stat).returns stub('stat', :ftype => 'socket')
+    it "should fail if the file is not a directory, link, file, fifo, socket, or is unknown" do
+      file.stubs(:stat).returns stub('stat', :ftype => 'blockSpecial')
 
-      expect { file.remove_existing(:file) }.to raise_error(Puppet::Error, /Could not back up files of type socket/)
+      file.expects(:warning).with("Could not back up file of type blockSpecial")
+      expect { file.remove_existing(:file) }.to raise_error(Puppet::Error, /Could not remove files of type blockSpecial/)
     end
 
     it "should invalidate the existing stat of the file" do
@@ -1091,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
 
@@ -1329,7 +1335,7 @@ describe Puppet::Type.type(:file) do
         expect(file.autorequire).to be_empty
       end
 
-      describe "on Windows systems", :if => Puppet.features.microsoft_windows? do
+      describe "on Windows systems", :if => Puppet::Util::Platform.windows? do
         describe "when using UNC filenames" do
           it "should autorequire its parent directory" do
             file[:path] = '//localhost/foo/bar/baz'
@@ -1404,7 +1410,7 @@ describe Puppet::Type.type(:file) do
     end
 
     it "should manage the mode of the followed link" do
-      if Puppet.features.microsoft_windows?
+      if Puppet::Util::Platform.windows?
         skip "Windows cannot presently manage the mode when following symlinks"
       else
         @link_resource[:links] = :follow
@@ -1464,6 +1470,8 @@ describe Puppet::Type.type(:file) do
   describe "when using source" do
     before do
       file[:source] = File.expand_path('/one')
+      # Contents of an empty file generate the below hash values
+      # in case you need to add support for additional algorithms in future
       @checksum_values = {
         :md5 => 'd41d8cd98f00b204e9800998ecf8427e',
         :md5lite => 'd41d8cd98f00b204e9800998ecf8427e',
@@ -1471,6 +1479,9 @@ describe Puppet::Type.type(:file) do
         :sha256lite => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855',
         :sha1 => 'da39a3ee5e6b4b0d3255bfef95601890afd80709',
         :sha1lite => 'da39a3ee5e6b4b0d3255bfef95601890afd80709',
+        :sha224 => 'd14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f',
+        :sha384 => '38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b',
+        :sha512 => 'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e',
         :mtime => 'Jan 26 13:59:49 2016',
         :ctime => 'Jan 26 13:59:49 2016'
       }
@@ -1500,7 +1511,8 @@ describe Puppet::Type.type(:file) do
 
     describe "on Windows when source_permissions is `use`" do
       before :each do
-        Puppet.features.stubs(:microsoft_windows?).returns true
+        Puppet::Util::Platform.stubs(:windows?).returns true
+
         file[:source_permissions] = "use"
       end
       let(:err_message) { "Copying owner/mode/group from the" <<
@@ -1564,6 +1576,9 @@ describe Puppet::Type.type(:file) do
         :sha256lite => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855',
         :sha1 => 'da39a3ee5e6b4b0d3255bfef95601890afd80709',
         :sha1lite => 'da39a3ee5e6b4b0d3255bfef95601890afd80709',
+        :sha224 => 'd14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f',
+        :sha384 => '38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b',
+        :sha512 => 'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e',
       }
     end