Merge branch 'backport-windows-work-to-2.7' into 2.7.x

* backport-windows-work-to-2.7: (60 commits)
  maint: Fix build break due to recent merge from 2.7.x to master
  Fix posix exec provider spec failures on Windows
  (#5495) Remove dead Windows-specific code from posix exec provider
  Stop trying to make config directories in Windows specs
  (#8272) Add missing tests for Windows service provider methods.
  (#8409) Add a default group provider for Windows
  (#8408) Add a default user provider for Windows
  (#8408/8409) Add a Windows ADSI helper module
  (#8663) Exclude exec timeout test on Windows
  (#8663) Exclude git rev-parse HEAD spec test on Windows
  Check for the appropriate permissions in File type tests on Windows
  Remove :fails_on_windows from file type tests that no longer fail on Windows
  Disable file bucket diffing tests on Windows
  Always put a slash between the checksum and path in filebucket URLs
  Treat Windows absolute paths as absolute paths
  Consolidate test logic determining if a registered file is in the temp directory
  Clarify logic and error messages when initializing Puppet::FileBucket::File
  Disable symlink related file tests on Windows
  (#8644) Host provider on Windows
  (#8660) Fix destdir option on Windows
  ...

1 files changed, 0 insertions, 1 deletions

diff --git a/spec/integration/resource/catalog_spec.rb b/spec/integration/resource/catalog_spec.rb
index 528e29545..df310b184 100755
--- a/spec/integration/resource/catalog_spec.rb
+++ b/spec/integration/resource/catalog_spec.rb
@@ -9,7 +9,6 @@ describe Puppet::Resource::Catalog do
   end
 
   describe "when using the indirector" do
-    after { Puppet::Util::Cacher.expire }
     before do
       # This is so the tests work w/out networking.
       Facter.stubs(:to_hash).returns({"hostname" => "foo.domain.com"})