Always using the cert name to store yaml files, which fixes #1178.

The Master handler previously provided the support for the :node_name
setting, and that functionality has now been moved into the Node
class.  At the same time, the names to search through have been
changed somewhat:  Previously, the certificate name and the
hostname were both used for searching, but now, the cert name
is always searched first (unless node_name == facter), but only
the Facter hostname, domain, and fqdn are used otherwise.  We no
longer split the cert name, only the hostname/domain/fqdn.

In the general case, this provides no behaviour change, because
people's hostname is the same as their certname.  This only
results in a change in behaviour if you specify a certificate
name that is a normal node name, and you want to look that node
up by something other than the full name in the certificate.

Signed-off-by: Luke Kanies <luke@madstop.com>

1 files changed, 3 insertions, 11 deletions

diff --git a/test/network/client/master.rb b/test/network/client/master.rb
index dc2140e62..9f71247fa 100755
--- a/test/network/client/master.rb
+++ b/test/network/client/master.rb
@@ -472,17 +472,8 @@ end
 
         Puppet::Node::Facts.indirection.stubs(:save)
 
-        master = client = nil
-        assert_nothing_raised() {
-            master = Puppet::Network::Handler.master.new(
-                :Local => false
-            )
-        }
-        assert_nothing_raised() {
-            client = Puppet::Network::Client.master.new(
-                :Master => master
-            )
-        }
+        master = Puppet::Network::Handler.master.new( :Local => false)
+        client = Puppet::Network::Client.master.new( :Master => master)
 
         # Fake that it's local, so it creates the class file
         client.local = false
@@ -491,6 +482,7 @@ end
         client.expects(:setclasses).with do |array|
             array.length == 2 and array.include?("yaytest") and array.include?("bootest")
         end
+
         assert_nothing_raised {
             client.getconfig
         }