[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35
Luke Kanies
luke at puppetlabs.com
Wed Jul 14 10:32:17 UTC 2010
The following commit has been merged in the upstream branch:
commit a27013ac1980ad3978a68794396c15cfffa81a86
Author: Luke Kanies <luke at puppetlabs.com>
Date: Fri Apr 9 16:20:57 2010 -0700
Fixing calls to "class_scope" in Scope tests
Signed-off-by: Luke Kanies <luke at puppetlabs.com>
diff --git a/spec/unit/parser/scope.rb b/spec/unit/parser/scope.rb
index 3d648fe..56bcd18 100755
--- a/spec/unit/parser/scope.rb
+++ b/spec/unit/parser/scope.rb
@@ -322,13 +322,13 @@ describe Puppet::Parser::Scope do
@scopes = {}
klass = @scope.known_resource_types.add(Puppet::Resource::Type.new(:hostclass, ""))
Puppet::Parser::Resource.new("class", :main, :scope => @scope, :source => mock('source')).evaluate
- @scopes[""] = @scope.compiler.class_scope(klass)
+ @scopes[""] = @scope.class_scope(klass)
@scopes[""].setvar("test", "value")
%w{one one::two one::two::three}.each do |name|
klass = @scope.known_resource_types.add(Puppet::Resource::Type.new(:hostclass, name))
Puppet::Parser::Resource.new("class", name, :scope => @scope, :source => mock('source')).evaluate
- @scopes[name] = @scope.compiler.class_scope(klass)
+ @scopes[name] = @scope.class_scope(klass)
@scopes[name].setvar("test", "value-#{name.sub(/.+::/,'')}")
end
end
@@ -396,7 +396,7 @@ describe Puppet::Parser::Scope do
%w{one one::two one::two::three}.each do |name|
klass = parser.newclass(name)
Puppet::Parser::Resource.new(:type => "class", :title => name, :scope => scope, :source => mock('source')).evaluate
- scopes[name] = scope.compiler.class_scope(klass)
+ scopes[name] = scope.class_scope(klass)
scopes[name].setvar("test", "value-%s" % name.sub(/.+::/,''))
end
--
Puppet packaging for Debian
More information about the Pkg-puppet-devel
mailing list