summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-04-11 16:12:38 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-04-11 16:12:38 +0000
commitde0d1ddf13a8486ee6fe253e8c5a242aeca38c6a (patch)
tree966abd3ddee38fb78ffe3786c16b0f081e397afe /test
parentbca4f5ea9df7c7374686fdee0ee672ed470ef91c (diff)
downloadpuppet-de0d1ddf13a8486ee6fe253e8c5a242aeca38c6a.tar.gz
Adding a few informative facts on the server side: serverversion, servername, serverip. And only printing the parse time in the interpreter if it is not a local connection.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1102 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test')
-rw-r--r--test/server/master.rb23
1 files changed, 23 insertions, 0 deletions
diff --git a/test/server/master.rb b/test/server/master.rb
index bd097a007..e3f065087 100644
--- a/test/server/master.rb
+++ b/test/server/master.rb
@@ -173,6 +173,29 @@ class TestMaster < Test::Unit::TestCase
assert(FileTest.exists?(file2), "Second file %s does not exist" % file2)
end
+ def test_addfacts
+ master = nil
+ file = mktestmanifest()
+ # create our master
+ assert_nothing_raised() {
+ # this is the default server setup
+ master = Puppet::Server::Master.new(
+ :Manifest => file,
+ :UseNodes => false,
+ :Local => true
+ )
+ }
+
+ facts = {}
+
+ assert_nothing_raised {
+ master.addfacts(facts)
+ }
+
+ %w{serverversion servername serverip}.each do |fact|
+ assert(facts.include?(fact), "Fact %s was not set" % fact)
+ end
+ end
end
# $Id$