diff options
| author | Hunter Haugen <hunter@puppetlabs.com> | 2014-06-19 16:25:16 -0700 |
|---|---|---|
| committer | Hunter Haugen <hunter@puppetlabs.com> | 2014-06-19 16:25:16 -0700 |
| commit | 4523bc50ca4eaac2f4a8d2840d1d13ec68742ab0 (patch) | |
| tree | fb3b511665dd8b7e4555e4f1c803202932de119e /spec/functions/getvar_spec.rb | |
| parent | 7d4fa05da13577072defe991b9de8b96ac4c3be7 (diff) | |
| parent | ffe21fc67491c4502114505c82142781d72720ab (diff) | |
| download | puppet-stdlib-4523bc50ca4eaac2f4a8d2840d1d13ec68742ab0.tar.gz puppet-stdlib-4523bc50ca4eaac2f4a8d2840d1d13ec68742ab0.tar.bz2 | |
Merge branch 'master' into 4.3.x
Diffstat (limited to 'spec/functions/getvar_spec.rb')
| -rwxr-xr-x | spec/functions/getvar_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/functions/getvar_spec.rb b/spec/functions/getvar_spec.rb index 5ff834e..87ab9b5 100755 --- a/spec/functions/getvar_spec.rb +++ b/spec/functions/getvar_spec.rb @@ -6,7 +6,7 @@ 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\./ + skip("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./ Puppet[:code] = '$foo = getvar()' expect { scope.compiler.compile @@ -14,7 +14,7 @@ describe Puppet::Parser::Functions.function(:getvar) do 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\./ + skip("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./ Puppet[:code] = '$foo = getvar("foo::bar", "baz")' expect { scope.compiler.compile @@ -22,7 +22,7 @@ describe Puppet::Parser::Functions.function(:getvar) do end it "should lookup variables in other namespaces" do - pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./ + skip("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./ Puppet[:code] = <<-'ENDofPUPPETcode' class site::data { $foo = 'baz' } include site::data |