diff options
| author | Luke Kanies <luke@puppetlabs.com> | 2010-05-19 09:32:44 -0700 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | e9627a060619eaf0f8eeb012979dddb047c6648e (patch) | |
| tree | 697304e0850d89aad99fca266e7dcd809775992d /test/lib | |
| parent | 61a719f41c5448ca9ab7bdbd6a05f6c97ee80b7f (diff) | |
| download | puppet-e9627a060619eaf0f8eeb012979dddb047c6648e.tar.gz puppet-e9627a060619eaf0f8eeb012979dddb047c6648e.tar.xz puppet-e9627a060619eaf0f8eeb012979dddb047c6648e.zip | |
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>
Diffstat (limited to 'test/lib')
| -rw-r--r-- | test/lib/puppettest/parsertesting.rb | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/test/lib/puppettest/parsertesting.rb b/test/lib/puppettest/parsertesting.rb index 0cc3ddef4..5ca5123e8 100644 --- a/test/lib/puppettest/parsertesting.rb +++ b/test/lib/puppettest/parsertesting.rb @@ -297,21 +297,11 @@ module PuppetTest::ParserTesting # This assumes no nodes def assert_creates(manifest, *files) - interp = nil oldmanifest = Puppet[:manifest] Puppet[:manifest] = manifest - trans = nil - assert_nothing_raised { - trans = Puppet::Parser::Compiler.new(mknode).compile - } - - config = nil - assert_nothing_raised { - config = trans.extract.to_catalog - } - - config.apply + catalog = Puppet::Parser::Compiler.new(mknode).compile.to_ral + catalog.apply files.each do |file| assert(FileTest.exists?(file), "Did not create %s" % file) |