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
  ...

4 files changed, 5 insertions, 29 deletions

diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb
index a60092cf7..6bae80a01 100755
--- a/test/lib/puppettest.rb
+++ b/test/lib/puppettest.rb
@@ -280,7 +280,6 @@ module PuppetTest
     Puppet::Util::Storage.clear
     Puppet.clear
     Puppet.settings.clear
-    Puppet::Util::Cacher.expire
 
     @memoryatend = Puppet::Util.memory
     diff = @memoryatend - @memoryatstart
diff --git a/test/network/handler/master.rb b/test/network/handler/master.rb
index 4c0374a76..9326e4b38 100755
--- a/test/network/handler/master.rb
+++ b/test/network/handler/master.rb
@@ -16,11 +16,6 @@ class TestMaster < Test::Unit::TestCase
     Puppet::Resource::Catalog.indirection.stubs(:find).returns(@catalog)
   end
 
-  def teardown
-    super
-    Puppet::Util::Cacher.expire
-  end
-
   def test_freshness_is_always_now
     now1 = mock 'now1'
     Time.stubs(:now).returns(now1)
diff --git a/test/network/server/webrick.rb b/test/network/server/webrick.rb
index 624147b6c..e1fd68921 100755
--- a/test/network/server/webrick.rb
+++ b/test/network/server/webrick.rb
@@ -11,24 +11,17 @@ class TestWebrickServer < Test::Unit::TestCase
 
   def setup
     Puppet::Util::SUIDManager.stubs(:asuser).yields
+    Puppet::SSL::Host.instance_variable_set(:@localhost, nil)
     super
   end
 
-  def teardown
-    super
-    Puppet::Network::HttpPool.clear_http_instances
-  end
-
   # Make sure we can create a server, and that it knows how to create its
   # certs by default.
   def test_basics
     server = nil
     assert_raise(Puppet::Error, "server succeeded with no cert") do
-
-            server = Puppet::Network::HTTPServer::WEBrick.new(
-                
+      server = Puppet::Network::HTTPServer::WEBrick.new(
         :Port => @@port,
-        
         :Handlers => {
           :Status => nil
         }
@@ -36,11 +29,8 @@ class TestWebrickServer < Test::Unit::TestCase
     end
 
     assert_nothing_raised("Could not create simple server") do
-
-            server = Puppet::Network::HTTPServer::WEBrick.new(
-                
+      server = Puppet::Network::HTTPServer::WEBrick.new(
         :Port => @@port,
-        
         :Handlers => {
           :CA => {}, # so that certs autogenerate
           :Status => nil
@@ -76,11 +66,8 @@ class TestWebrickServer < Test::Unit::TestCase
     client = nil
 
     assert_nothing_raised {
-
-            client = Puppet::Network::Client.status.new(
-                
+      client = Puppet::Network::Client.status.new(
         :Server => "localhost",
-        
         :Port => @@port
       )
     }
@@ -91,17 +78,13 @@ class TestWebrickServer < Test::Unit::TestCase
     server = nil
     Puppet[:certdnsnames] = "localhost"
     assert_nothing_raised {
-
-            server = Puppet::Network::HTTPServer::WEBrick.new(
-                
+      server = Puppet::Network::HTTPServer::WEBrick.new(
         :Port => @@port,
-        
         :Handlers => {
           :CA => {}, # so that certs autogenerate
           :Status => nil
         }
       )
-
     }
 
     pid = fork {
diff --git a/test/ral/type/filesources.rb b/test/ral/type/filesources.rb
index 3363aafb3..f39d53907 100755
--- a/test/ral/type/filesources.rb
+++ b/test/ral/type/filesources.rb
@@ -26,7 +26,6 @@ class TestFileSources < Test::Unit::TestCase
 
   def teardown
     super
-    Puppet::Network::HttpPool.clear_http_instances
   end
 
   def use_storage