From c81496ef5e7554cad02cb379fa75ba8b9683ff45 Mon Sep 17 00:00:00 2001 From: Jeff McCune Date: Mon, 20 Aug 2012 14:21:12 -0700 Subject: Disable tests that fail on 2.6.x due to #15912 In Puppet 2.6.x there is a bug where a function may be incorrectly detected as an rvalue when it is not, or not detected when it is. This means that in tests the correct syntax for calling a function will be rejected. This disables those tests on 2.6.x, as there is no straightforward way to write them to be compatible with both 2.6.x and newer versions of Puppet. Conflicts: spec/unit/puppet/parser/functions/getvar_spec.rb spec/unit/puppet/parser/functions/has_key_spec.rb spec/unit/puppet/parser/functions/merge_spec.rb This patch was constructed by cherry-picking e27eccb and resolving the merge conflicts to only include the `pending` statements. This resolves the problem by disabling these tests in Puppet 2.6. --- spec/unit/puppet/parser/functions/has_key_spec.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'spec/unit/puppet/parser/functions/has_key_spec.rb') diff --git a/spec/unit/puppet/parser/functions/has_key_spec.rb b/spec/unit/puppet/parser/functions/has_key_spec.rb index bf91509..bb2cc76 100644 --- a/spec/unit/puppet/parser/functions/has_key_spec.rb +++ b/spec/unit/puppet/parser/functions/has_key_spec.rb @@ -22,14 +22,17 @@ describe Puppet::Parser::Functions.function(:has_key) do describe 'when calling has_key from puppet' do it "should not compile when no arguments are passed" do + pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./ Puppet[:code] = '$rval = has_key()' expect { compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/) end it "should not compile when 1 argument is passed" do + pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./ Puppet[:code] = "$rval = has_key('foo')" expect { compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/) end it "should require the first value to be a Hash" do + pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./ Puppet[:code] = "$rval = has_key('foo', 'bar')" expect { compiler.compile }.should raise_error(Puppet::ParseError, /expects the first argument to be a hash/) end -- cgit v1.2.3