Cleaning up plugin handling a bit -- they can now be colon-separated paths, and I added a separate "plugindest" setting for determining where plugins are synchronized to. The major feature I added, though, is that Puppet::Type now knows how to load plugins, and treats :pluginpath as a search path for plugins.

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

1 files changed, 8 insertions, 1 deletions

diff --git a/test/client/master.rb b/test/client/master.rb
index a2dbad22d..0a35a78c3 100644
--- a/test/client/master.rb
+++ b/test/client/master.rb
@@ -154,7 +154,7 @@ end
             client.send(:getplugins)
         }
 
-        destfile = File.join(Puppet[:pluginpath], "myplugin.rb")
+        destfile = File.join(Puppet[:plugindest], "myplugin.rb")
 
         assert(File.exists?(destfile), "Did not get plugin")
 
@@ -196,5 +196,12 @@ end
 
         assert(! obj.validattr?(:argument),
             "Old namevar is still valid")
+
+        # Now make sure it works with multiple paths specified.
+        newdir = tempfile()
+        Dir.mkdir(newdir)
+        Puppet[:pluginpath] = [Puppet[:pluginpath], newdir].join(":")
+
+        client.send(:getplugins)
     end
 end