summaryrefslogtreecommitdiffstats
path: root/test/network/client/master.rb
diff options
context:
space:
mode:
Diffstat (limited to 'test/network/client/master.rb')
-rwxr-xr-xtest/network/client/master.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/test/network/client/master.rb b/test/network/client/master.rb
index 0c1405217..90f747d94 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