[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.5-303-gfcfa26a

[Daniel Pittman]

The following commit has been merged in the upstream branch:
commit d9b168b00a7c86489d8b1cf7c28d4e37205710f7
Merge: e512e3effa134271564177e095c6afc19bebe62f 414e3a5989c4c1010af0c5d3f61af2608d91d9b8
Author: Daniel Pittman <daniel at puppetlabs.com>
Date:   Sat Feb 12 15:18:38 2011 -0800

    Merge branch 'masterzen/tickets/2.6.x/5516' into bug/2.6.next/5516-hashes-can't-be-used-in-selectors

diff --combined spec/unit/parser/parser_spec.rb
index 2f5d4b8,9e4c795..6cc393d
--- a/spec/unit/parser/parser_spec.rb
+++ b/spec/unit/parser/parser_spec.rb
@@@ -76,6 -76,12 +76,12 @@@ describe Puppet::Parser d
  
    end
  
+   describe "when parsing selector" do
+     it "should support hash access on the left hand side" do
+       lambda { @parser.parse("$h = { 'a' => 'b' } $a = $h['a'] ? { 'b' => 'd', default => undef }") }.should_not raise_error
+     end
+   end
+ 
    describe "when parsing 'if'" do
      it "not, it should create the correct ast objects" do
        ast::Not.expects(:new).with { |h| h[:value].is_a?(ast::Boolean) }
@@@ -276,7 -282,7 +282,7 @@@
      it "should include docs when the AST class uses them" do
        @class.expects(:use_docs).returns true
        @class.stubs(:new)
 -      @parser.expects(:ast_context).with{ |a| a[0] == true }.returns({})
 +      @parser.expects(:ast_context).with{ |docs, line| docs == true }.returns({})
        @parser.ast(@class, :file => "/bar")
      end
  
@@@ -304,33 -310,6 +310,33 @@@
      it "should return an array of nodes" do
        @parser.newnode(@nodename).should be_instance_of(Array)
      end
 +
 +    it "should initialize the ast context with the correct line number" do
 +      @parser.expects(:ast_context).with { |a,b| b == 123 }.returns({})
 +      @parser.newnode(@nodename, { :line => 123 })
 +    end
 +  end
 +
 +  %w{class define}.each do |entity|
 +    describe "when creating a #{entity}" do
 +      before :each do
 +        @parser.stubs(:ast_context).returns({})
 +
 +        @name = stub "#{entity}name", :is_a? => false, :value => "foo"
 +      end
 +
 +      it "should create and add the correct resource type" do
 +        instance = stub 'instance'
 +        Puppet::Resource::Type.expects(:new).returns(instance)
 +        @parser.known_resource_types.expects(:add).with(instance)
 +        @parser.send("new#{entity}", @name)
 +      end
 +
 +      it "should initialize the ast context with the correct line number" do
 +        @parser.expects(:ast_context).with { |a,b| b == 123 }.returns({})
 +        @parser.send("new#{entity}", @name, { :line => 123 })
 +      end
 +    end
    end
  
    describe "when retrieving a specific node" do

-- 
Puppet packaging for Debian