Merge branch '0.24.x'

Conflicts:

	lib/puppet/metatype/container.rb
	lib/puppet/metatype/instances.rb
	lib/puppet/metatype/metaparams.rb
	lib/puppet/metatype/relationships.rb
	lib/puppet/metatype/schedules.rb

1 files changed, 10 insertions, 0 deletions

diff --git a/test/language/functions.rb b/test/language/functions.rb
index 97429802b..50a61a148 100755
--- a/test/language/functions.rb
+++ b/test/language/functions.rb
@@ -379,6 +379,8 @@ class TestLangFunctions < Test::Unit::TestCase
         scope = mkscope
         parser = scope.compiler.parser
     
+        realize = Puppet::Parser::Functions.function(:realize)
+
         # Make a definition
         parser.newdefine("mytype")
         
@@ -434,6 +436,8 @@ class TestLangFunctions < Test::Unit::TestCase
     def test_defined
         scope = mkscope
         parser = scope.compiler.parser
+
+        defined = Puppet::Parser::Functions.function(:defined)
         
         parser.newclass("yayness")
         parser.newdefine("rahness")
@@ -491,6 +495,8 @@ class TestLangFunctions < Test::Unit::TestCase
         scope = mkscope
         parser = scope.compiler.parser
 
+        include = Puppet::Parser::Functions.function(:include)
+
         assert_raise(Puppet::ParseError, "did not throw error on missing class") do
             scope.function_include("nosuchclass")
         end
@@ -508,6 +514,8 @@ class TestLangFunctions < Test::Unit::TestCase
         parser = mkparser
         scope = mkscope(:parser => parser)
 
+        file = Puppet::Parser::Functions.function(:file)
+
         file1 = tempfile
         file2 = tempfile
         file3 = tempfile
@@ -548,6 +556,8 @@ class TestLangFunctions < Test::Unit::TestCase
         assert_equal("yay\n", %x{#{command}}, "command did not work")
         assert_equal("yay-foo\n", %x{#{command} foo}, "command did not work")
 
+        generate = Puppet::Parser::Functions.function(:generate)
+
         scope = mkscope
         parser = scope.compiler.parser