Merge branch '0.24.x' Removed the 'after' blocks that call Type.clear,

since that method is deprecated.

Conflicts:

	CHANGELOG
	bin/puppetca
	lib/puppet/file_serving/fileset.rb
	lib/puppet/network/xmlrpc/client.rb
	lib/puppet/type/file/selcontext.rb
	spec/unit/file_serving/metadata.rb
	spec/unit/type/file.rb

1 files changed, 2 insertions, 6 deletions

diff --git a/test/network/client/master.rb b/test/network/client/master.rb
index 24c7b6374..e27b7a3a2 100755
--- a/test/network/client/master.rb
+++ b/test/network/client/master.rb
@@ -402,12 +402,9 @@ end
             client.send(:splay)
         end
 
-        time = Puppet::Util::Storage.cache(:configuration)[:splay_time]
-        assert(time, "Splay time was not cached")
-
         # Now try it again
         client = mkclient
-        client.expects(:sleep).with(time)
+        client.expects(:sleep)
 
         assert_nothing_raised("Failed to call sleep when splay is true with a cached value") do
             client.send(:splay)
@@ -419,8 +416,7 @@ end
         assert_equal(facts["environment"], Puppet[:environment], "Did not add environment to client facts")
 
         # Now set it to a real value
-        Puppet[:environments] = "something,else"
-        Puppet[:environment] = "something"
+	Puppet[:environment] = "something"
         facts = Puppet::Network::Client::Master.facts
         assert_equal(facts["environment"], Puppet[:environment], "Did not add environment to client facts")
     end