summaryrefslogtreecommitdiffstats
path: root/test/language
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-11-13 10:34:50 -0600
committerLuke Kanies <luke@madstop.com>2007-11-13 10:34:50 -0600
commitb65fb8316e10fb31c4ac9d0af75bb3e7f452d312 (patch)
treea446e28f15917737be4fdaec3d7ebff71e188c9c /test/language
parentfa1924eb04a2d6600349eddf13e1f3e62b45d6ce (diff)
downloadpuppet-b65fb8316e10fb31c4ac9d0af75bb3e7f452d312.tar.gz
puppet-b65fb8316e10fb31c4ac9d0af75bb3e7f452d312.tar.xz
puppet-b65fb8316e10fb31c4ac9d0af75bb3e7f452d312.zip
Fixing a parser test -- really, just removing tests
that belong with the AST classes rather than in the parser. Yeah, these tests need to be rewritten. Committed on an airplane. :)
Diffstat (limited to 'test/language')
-rwxr-xr-xtest/language/parser.rb20
1 files changed, 3 insertions, 17 deletions
diff --git a/test/language/parser.rb b/test/language/parser.rb
index bc89eff20..9a2aed711 100755
--- a/test/language/parser.rb
+++ b/test/language/parser.rb
@@ -6,9 +6,12 @@ require 'mocha'
require 'puppet'
require 'puppet/parser/parser'
require 'puppettest'
+require 'puppettest/support/utils'
class TestParser < Test::Unit::TestCase
+ include PuppetTest
include PuppetTest::ParserTesting
+ include PuppetTest::Support::Utils
def setup
super
Puppet[:parseonly] = true
@@ -489,23 +492,6 @@ file { "/tmp/yayness":
assert_instance_of(AST::Resource, res)
check.call(res, "multiresource")
end
-
- # Now evaluate these
- scope = mkscope
-
- klass = parser.newclass ""
- scope.source = klass
-
- assert_nothing_raised do
- ret.classes[""].evaluate :scope => scope, :resource => Puppet::Parser::Resource.new(:type => "mydefine", :title => 'whatever', :scope => scope, :source => scope.source)
- end
-
- # Make sure we can find both of them
- %w{/tmp/1 /tmp/2}.each do |title|
- res = scope.findresource("File[#{title}]")
- assert(res, "Could not find %s" % title)
- check.call(res, "found multiresource")
- end
end
end