Fixing #2658 - adding backward compatibility for 0.24

The way stages were implemented caused backward compatibility
to be completely broken for 0.24.x.

This commit fixes that, mostly by assuming Stage[main] will be the
top node in the graph rather than Class[main].

Other stages are not supported in 0.24.x, and explicitly throw a warning
(although not an error).

Signed-off-by: Luke Kanies <luke@puppetlabs.com>

2 files changed, 4 insertions, 12 deletions

diff --git a/test/language/scope.rb b/test/language/scope.rb
index 17e97ecfb..0bed35c14 100755
--- a/test/language/scope.rb
+++ b/test/language/scope.rb
@@ -201,13 +201,9 @@ Host <<||>>"
         node = mknode
         node.merge "hostname" => node.name
         2.times { |i|
-            config = Puppet::Parser::Compiler.new(node).compile
-
-            flat = config.extract.flatten
-
-            %w{puppet myhost}.each do |name|
-                assert(flat.find{|o| o.name == name }, "Did not find #{name}")
-            end
+            catalog = Puppet::Parser::Compiler.new(node).compile
+            assert_instance_of(Puppet::Parser::Resource, catalog.resource(:host, "puppet"))
+            assert_instance_of(Puppet::Parser::Resource, catalog.resource(:host, "myhost"))
         }
     ensure
         Puppet[:storeconfigs] = false
diff --git a/test/language/snippets.rb b/test/language/snippets.rb
index f083c355c..0d647f7de 100755
--- a/test/language/snippets.rb
+++ b/test/language/snippets.rb
@@ -204,11 +204,7 @@ class TestSnippets < Test::Unit::TestCase
         file = @catalog.resource(:file, path)
         assert(file, "did not create file %s" % path)
 
-        assert_nothing_raised {
-            assert_equal(
-                "//Testing/Mytype[componentname]/File[/tmp/classtest]",
-                file.path)
-        }
+        assert_equal( "/Stage[main]/Testing/Mytype[componentname]/File[/tmp/classtest]", file.path)
     end
 
     def snippet_argumentdefaults