diff options
| author | Luke Kanies <luke@madstop.com> | 2008-03-25 18:18:34 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-03-25 18:18:34 -0500 |
| commit | a8592f1009040ebf30a98268610915cc33bb3f63 (patch) | |
| tree | 49f61323a8536d58ce332e97b882677f55727df7 /test/network/handler/master.rb | |
| parent | e1907798425a7b163ac1b831b0cf11e88985815e (diff) | |
| parent | 491a69682728818e04b8a20a5d8f4f783ad6ddaf (diff) | |
| download | puppet-a8592f1009040ebf30a98268610915cc33bb3f63.tar.gz puppet-a8592f1009040ebf30a98268610915cc33bb3f63.tar.xz puppet-a8592f1009040ebf30a98268610915cc33bb3f63.zip | |
Merge branch '0.24.x'
Conflicts:
install.rb
lib/puppet/defaults.rb
man/man8/puppet.8
Diffstat (limited to 'test/network/handler/master.rb')
| -rwxr-xr-x | test/network/handler/master.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/network/handler/master.rb b/test/network/handler/master.rb index 88bfe6b7e..55522237b 100755 --- a/test/network/handler/master.rb +++ b/test/network/handler/master.rb @@ -90,11 +90,15 @@ class TestMaster < Test::Unit::TestCase resname, resip = master.send(:clientname, nil, nil, facts) assert_equal(facts["hostname"], resname, "Did not use fact hostname when no certname was present") assert_equal(facts["ipaddress"], resip, "Did not use fact ip when no certname was present") + assert_equal(facts["domain"], "fact_domain", "Did not use fact domain when no certname was present") + assert_equal(facts["fqdn"], "fact_hostname.fact_domain", "Did not use fact fqdn when no certname was present") # Now try it with the cert stuff present resname, resip = master.send(:clientname, certname, certip, facts) assert_equal(certname, resname, "Did not use cert hostname when certname was present") assert_equal(certip, resip, "Did not use cert ip when certname was present") + assert_equal(facts["domain"], certdomain, "Did not use cert domain when certname was present") + assert_equal(facts["fqdn"], certname, "Did not use cert fqdn when certname was present") # And reset the node_name stuff and make sure we use it. Puppet[:node_name] = :facter |