Merge branch 'configurations' into indirection

Conflicts:

	lib/puppet/defaults.rb
	lib/puppet/indirector/facts/yaml.rb
	spec/unit/indirector/indirection.rb
	spec/unit/indirector/indirector.rb

1 files changed, 4 insertions, 11 deletions

diff --git a/test/language/snippets.rb b/test/language/snippets.rb
index ff8a09881..7168a81d8 100755
--- a/test/language/snippets.rb
+++ b/test/language/snippets.rb
@@ -197,7 +197,7 @@ class TestSnippets < Test::Unit::TestCase
     def snippet_classpathtest
         path = "/tmp/classtest"
 
-        file = @file[path]
+        file = @configuration.resource(:file, path)
         assert(file, "did not create file %s" % path)
 
         assert_nothing_raised {
@@ -271,14 +271,6 @@ class TestSnippets < Test::Unit::TestCase
         assert_mode_equal(0755, file)
     end
 
-    def snippet_failmissingexecpath
-        file = "/tmp/exectesting1"
-        execfile = "/tmp/execdisttesting"
-        assert_file(file)
-
-        assert_nil(Puppet::Type.type(:exec)["exectest"], "invalid exec was created")
-    end
-
     def snippet_selectorvalues
         nums = %w{1 2 3 4 5}
         files = nums.collect { |n|
@@ -473,8 +465,8 @@ class TestSnippets < Test::Unit::TestCase
                     :Local => true
                 )
                 facts = Puppet::Node::Facts.new("testhost", facts)
-                Puppet::Node::Facts.stubs(:post)
-                Puppet::Node::Facts.stubs(:get).returns(facts)
+                Puppet::Node::Facts.stubs(:save)
+                Puppet::Node::Facts.stubs(:find).returns(facts)
                 client = Puppet::Network::Client.master.new(
                     :Master => server,
                     :Cache => false
@@ -508,6 +500,7 @@ class TestSnippets < Test::Unit::TestCase
                         assert(obj.name)
                     }
                 }
+                @configuration = client.configuration
                 assert_nothing_raised {
                     self.send(mname)
                 }