summaryrefslogtreecommitdiffstats
path: root/test/language
diff options
context:
space:
mode:
authorshadoi <shadoi@980ebf18-57e1-0310-9a29-db15c13687c0>2006-12-19 22:04:09 +0000
committershadoi <shadoi@980ebf18-57e1-0310-9a29-db15c13687c0>2006-12-19 22:04:09 +0000
commit115ec095357171381e2af3aa5ebbd61164b40064 (patch)
tree2060872eefd6fdbae72a20cb95998a1d364c8a80 /test/language
parentf851ca64cf3861ffa63cf2698fd4719361803f82 (diff)
downloadpuppet-115ec095357171381e2af3aa5ebbd61164b40064.tar.gz
puppet-115ec095357171381e2af3aa5ebbd61164b40064.tar.xz
puppet-115ec095357171381e2af3aa5ebbd61164b40064.zip
Re-add support for tags and file/lines
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1953 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/language')
-rwxr-xr-xtest/language/ast.rb2
-rwxr-xr-xtest/language/collector.rb2
2 files changed, 1 insertions, 3 deletions
diff --git a/test/language/ast.rb b/test/language/ast.rb
index d42ac7936..3fb6f5c0d 100755
--- a/test/language/ast.rb
+++ b/test/language/ast.rb
@@ -496,8 +496,6 @@ class TestAST < Test::Unit::TestCase
assert_equal(1, retval.length, "Did not find resource with '#{string}'")
res = retval.shift
- # Not sure this is correct, maybe we need a case statement to convert to/from
- # the autogenerated Puppet<Type> classes to <type>
assert_equal("file", res.restype)
assert_equal("/tmp/testing", res.title)
else
diff --git a/test/language/collector.rb b/test/language/collector.rb
index 41ce12f66..83ae3a590 100755
--- a/test/language/collector.rb
+++ b/test/language/collector.rb
@@ -281,7 +281,7 @@ class TestCollector < Test::Unit::TestCase
# Make our configuration
host = Puppet::Rails::Host.new(:name => "myhost")
- host.resources.build(:title => "/tmp/hosttest", :type => "PuppetFile",
+ host.resources.build(:title => "/tmp/hosttest", :type => "file",
:exported => true)
host.save