summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-01-28 15:07:02 +1100
committerLuke Kanies <luke@madstop.com>2008-01-28 15:07:02 +1100
commit7a4935f7b31a7d1bd8264ed6d0b69cc90a7882b4 (patch)
tree2015379e1c33d8410f5ab6f7e13c4460764fb74c /test
parent89d5517f1b522b4e71a78409552b4756143be07d (diff)
downloadpuppet-7a4935f7b31a7d1bd8264ed6d0b69cc90a7882b4.tar.gz
puppet-7a4935f7b31a7d1bd8264ed6d0b69cc90a7882b4.tar.xz
puppet-7a4935f7b31a7d1bd8264ed6d0b69cc90a7882b4.zip
Fixing a couple of tests, one related to recent tagging changes
and one that somehow slipped through when I removed the GRATR code.
Diffstat (limited to 'test')
-rwxr-xr-xtest/language/compile.rb4
-rwxr-xr-xtest/language/resource.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/test/language/compile.rb b/test/language/compile.rb
index 298493c0a..082b37a1c 100755
--- a/test/language/compile.rb
+++ b/test/language/compile.rb
@@ -64,7 +64,7 @@ class TestCompile < Test::Unit::TestCase
end
assert_instance_of(Scope, compile.topscope, "Did not create a topscope")
graph = compile.instance_variable_get("@scope_graph")
- assert_instance_of(GRATR::Digraph, graph, "Did not create scope graph")
+ assert_instance_of(Puppet::SimpleGraph, graph, "Did not create scope graph")
assert(graph.vertex?(compile.topscope), "Did not add top scope as a vertex in the graph")
end
@@ -111,7 +111,7 @@ class TestCompile < Test::Unit::TestCase
compile = mkcompile
graph = compile.instance_variable_get("@scope_graph")
assert_instance_of(Scope, compile.topscope, "Did not create top scope")
- assert_instance_of(GRATR::Digraph, graph, "Did not create graph")
+ assert_instance_of(Puppet::SimpleGraph, graph, "Did not create graph")
assert(graph.vertex?(compile.topscope), "The top scope is not a vertex in the graph")
diff --git a/test/language/resource.rb b/test/language/resource.rb
index 84a30b029..5a3916159 100755
--- a/test/language/resource.rb
+++ b/test/language/resource.rb
@@ -464,8 +464,8 @@ class TestResource < PuppetTest::TestCase
scope = stub 'scope', :resource => scope_resource
resource = Puppet::Parser::Resource.new(:type => "file", :title => "yay", :scope => scope, :source => mock('source'))
- # Make sure we get the scope resource's tags, plus the type and title
- %w{srone srtwo yay file}.each do |tag|
+ # Make sure we get the type and title
+ %w{yay file}.each do |tag|
assert(resource.tags.include?(tag), "Did not tag resource with %s" % tag)
end