diff options
| author | Luke Kanies <luke@madstop.com> | 2008-03-16 17:21:27 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-03-16 17:21:27 -0500 |
| commit | 80f69ce86d245b45aeb93964aed9b3daca7d0d80 (patch) | |
| tree | ce9208d6754443fc4ff2ac1d6c735041ece6f48e /test | |
| parent | 8b2936861378f652b9f6b29accf3985f58b7356e (diff) | |
| parent | 388cf7c3df7ce26e953949ed6fe63d76cbbb3691 (diff) | |
| download | puppet-80f69ce86d245b45aeb93964aed9b3daca7d0d80.tar.gz puppet-80f69ce86d245b45aeb93964aed9b3daca7d0d80.tar.xz puppet-80f69ce86d245b45aeb93964aed9b3daca7d0d80.zip | |
Merge commit 'johnf/0.24.x' into 0.24.x
Diffstat (limited to 'test')
| -rwxr-xr-x | test/network/handler/master.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/test/network/handler/master.rb b/test/network/handler/master.rb index 25117030e..88bfe6b7e 100755 --- a/test/network/handler/master.rb +++ b/test/network/handler/master.rb @@ -76,8 +76,15 @@ class TestMaster < Test::Unit::TestCase Puppet[:node_name] = "cert" # Make sure we get the fact data back when nothing is set - facts = {"hostname" => "fact_hostname", "ipaddress" => "fact_ip"} - certname = "cert_hostname" + facts = { + "hostname" => "fact_hostname", + "domain" => "fact_domain", + "fqdn" => "fact_hostname.fact_domain", + "ipaddress" => "fact_ip" + } + certhostname = "cert_hostname" + certdomain = "cert_domain" + certname = certhostname + "." + certdomain certip = "cert_ip" resname, resip = master.send(:clientname, nil, nil, facts) |