Merge branch 'master' into master_no_global_resources

Conflicts:

	lib/puppet/node/catalog.rb
	lib/puppet/type/pfile.rb
	lib/puppet/type/pfilebucket.rb
	lib/puppet/util/filetype.rb
	spec/unit/node/catalog.rb
	spec/unit/other/transbucket.rb
	spec/unit/ral/provider/mount/parsed.rb
	spec/unit/ral/types/file.rb
	spec/unit/ral/types/interface.rb
	spec/unit/ral/types/mount.rb
	spec/unit/ral/types/package.rb
	spec/unit/ral/types/schedule.rb
	spec/unit/ral/types/service.rb
	test/language/compile.rb
	test/language/lexer.rb
	test/language/snippets.rb
	test/lib/puppettest.rb
	test/ral/types/basic.rb
	test/ral/types/cron.rb
	test/ral/types/exec.rb
	test/ral/types/file.rb
	test/ral/types/file/target.rb
	test/ral/types/filebucket.rb
	test/ral/types/fileignoresource.rb
	test/ral/types/filesources.rb
	test/ral/types/group.rb
	test/ral/types/host.rb
	test/ral/types/parameter.rb
	test/ral/types/sshkey.rb
	test/ral/types/tidy.rb
	test/ral/types/user.rb
	test/ral/types/yumrepo.rb

2 files changed, 24 insertions, 68 deletions

diff --git a/test/util/autoload.rb b/test/util/autoload.rb
index 6babed774..de503ab99 100755
--- a/test/util/autoload.rb
+++ b/test/util/autoload.rb
@@ -103,10 +103,10 @@ TestAutoload.newthing(:#{name.to_s})
         assert(loader.send(:searchpath).include?(dir), "searchpath does not include the libdir")
     end
 
-    # This causes very strange behaviour in the tests.  We need to make sure we
-    # require the same path that a user would use, otherwise we'll result in
-    # a reload of the 
-    def test_require_does_not_cause_reload
+    # This tests #1027, which was caused by using the unqualified
+    # path for requires, which was initially done so that the kernel
+    # would keep track of which files got loaded.
+    def test_require_uses_full_path
         loadname = "testing"
         loader = Puppet::Util::Autoload.new(self.class, loadname)
 
@@ -120,7 +120,26 @@ TestAutoload.newthing(:#{name.to_s})
 
         Dir.expects(:glob).with("#{dir}/*.rb").returns(file)
 
-        Kernel.expects(:require).with(File.join(loadname, subname))
+        Kernel.expects(:require).with(file)
         loader.loadall
     end
+
+    def test_searchpath_includes_plugin_dirs
+        moddir = "/what/ever"
+        libdir = "/other/dir"
+        Puppet.settings.stubs(:value).with(:modulepath).returns(moddir)
+        Puppet.settings.stubs(:value).with(:libdir).returns(libdir)
+
+        loadname = "testing"
+        loader = Puppet::Util::Autoload.new(self.class, loadname)
+
+        # Currently, include both plugins and libs.
+        paths = %w{plugins lib}.inject({}) { |hash, d| hash[d] = File.join(moddir, "testing", d); FileTest.stubs(:directory?).with(hash[d]).returns(true); hash  }
+        Dir.expects(:glob).with("#{moddir}/*/{plugins,lib}").returns(paths.values)
+
+        searchpath = loader.searchpath
+        paths.each do |dir, path|
+            assert(searchpath.include?(path), "search path did not include path for %s" % dir)
+        end
+    end
 end
diff --git a/test/util/settings.rb b/test/util/settings.rb
index cf5dca76d..de6fff946 100755
--- a/test/util/settings.rb
+++ b/test/util/settings.rb
@@ -256,69 +256,6 @@ yay = /a/path
         end
     end
 
-    def test_old_parse
-        text = %{
-one = this is a test
-two = another test
-owner = root
-group = root
-yay = /a/path
-
-[section1]
-    attr = value
-    owner = puppet
-    group = puppet
-    attrdir = /some/dir
-    attr3 = $attrdir/other
-        }
-
-        file = tempfile()
-        File.open(file, "w") { |f| f.puts text }
-
-        assert_nothing_raised {
-            @config.setdefaults("puppet",
-                :one => ["a", "one"],
-                :two => ["a", "two"],
-                :yay => ["/default/path", "boo"],
-                :mkusers => [true, "uh, yeah"]
-            )
-        }
-
-        assert_nothing_raised {
-            @config.setdefaults("section1",
-                :attr => ["a", "one"],
-                :attrdir => ["/another/dir", "two"],
-                :attr3 => ["$attrdir/maybe", "boo"]
-            )
-        }
-        
-        assert_nothing_raised {
-            @config.old_parse(file)
-        }
-
-        assert_equal("value", @config[:attr])
-        assert_equal("/some/dir", @config[:attrdir])
-        assert_equal(:directory, @config.element(:attrdir).type)
-        assert_equal("/some/dir/other", @config[:attr3])
-
-        elem = nil
-        assert_nothing_raised {
-            elem = @config.element(:attr3)
-        }
-
-        assert(elem)
-        assert_equal("puppet", elem.owner)
-
-        config = nil
-        assert_nothing_raised {
-            config = @config.to_config
-        }
-
-        assert_nothing_raised("Could not create transportable config") {
-            @config.to_transportable
-        }
-    end
-
     def test_parse
         result = {
             :main => {:main => "main", :bad => "invalid", :cliparam => "reset"},