diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2012-08-20 14:22:40 -0700 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2012-08-20 14:22:40 -0700 |
commit | 8fdd59547d89767cef1a58fdabeff25d51692cbf (patch) | |
tree | 03657b5c290176bb4d2ede7be94dfde76da32a7a /spec/unit/puppet/parser/functions/getvar_spec.rb | |
parent | 3f44686f1c0112cc0febaaa8ad844f02d85562cf (diff) | |
parent | c81496ef5e7554cad02cb379fa75ba8b9683ff45 (diff) |
Merge branch 'fix/2.1.x/disable_puppet26_failing_tests' into 2.1.x
* fix/2.1.x/disable_puppet26_failing_tests:
Disable tests that fail on 2.6.x due to #15912
Diffstat (limited to 'spec/unit/puppet/parser/functions/getvar_spec.rb')
-rw-r--r-- | spec/unit/puppet/parser/functions/getvar_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/unit/puppet/parser/functions/getvar_spec.rb b/spec/unit/puppet/parser/functions/getvar_spec.rb index 271f15e..b150a0e 100644 --- a/spec/unit/puppet/parser/functions/getvar_spec.rb +++ b/spec/unit/puppet/parser/functions/getvar_spec.rb @@ -23,11 +23,13 @@ describe Puppet::Parser::Functions.function(:getvar) do describe 'when calling getvar 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 = getvar()' get_scope expect { @scope.compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/) end it "should not compile when too many arguments are passed" do + pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./ Puppet[:code] = '$rval = getvar("foo::bar", "baz")' get_scope expect { @scope.compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/) |