Added a test for Type#remove, and fixed the method so it actually works. I was missing every other object, because i was iterating over the array being modified. This caused the Config stuff to often fail, because objects were not correctly being removed. All fixed now, though.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1053 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 5 insertions, 17 deletions

diff --git a/test/client/client.rb b/test/client/client.rb
index 117d30426..fe116bf56 100644
--- a/test/client/client.rb
+++ b/test/client/client.rb
@@ -109,24 +109,12 @@ class TestClient < Test::Unit::TestCase
             )
         }
 
-        # clean up the existing certs, so the server creates a new CA
-        #system("rm -rf %s" % Puppet[:ssldir])
+        # Create a new ssl root.
         confdir = tempfile()
-        Puppet[:confdir] = confdir
-
-        # Now we need to recreate the directory structure
-        [:certificates, :ca].each { |section|
-            Puppet.config.params(section).each { |param|
-                val = Puppet[param]
-                if val =~ /^#{File::SEPARATOR}/
-                    if param.to_s =~ /dir/
-                        Puppet::Util.recmkdir(val)
-                    else
-                        Puppet::Util.recmkdir(File.dirname(val))
-                    end
-                end
-            }
-        }
+        Puppet[:ssldir] = confdir
+        Puppet.config.mkdir(:ssldir)
+        Puppet.config.clearused
+        Puppet.config.use(:certificates, :ca)
 
         mkserver