summaryrefslogtreecommitdiffstats
path: root/spec/unit/parser/ast
diff options
context:
space:
mode:
authorPieter van de Bruggen <pieter@puppetlabs.com>2011-05-17 14:50:40 -0700
committerPieter van de Bruggen <pieter@puppetlabs.com>2011-05-17 14:50:40 -0700
commitf9e44f041b3fdc120b1c78554c35c83f7517152e (patch)
treef5d4687277fff6fe697a92089f1fa9283dce1bb4 /spec/unit/parser/ast
parent99d437d2bbc2339f092304715ec562fbbcb0a50c (diff)
parentc8b294a0b0a1fc91a64c0a1ac3bab3b2aec92faf (diff)
Merge branch '2.7.x' into 2.7.next
Diffstat (limited to 'spec/unit/parser/ast')
-rwxr-xr-xspec/unit/parser/ast/function_spec.rb2
-rwxr-xr-xspec/unit/parser/ast/selector_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/unit/parser/ast/function_spec.rb b/spec/unit/parser/ast/function_spec.rb
index c52e806e9..d683b122b 100755
--- a/spec/unit/parser/ast/function_spec.rb
+++ b/spec/unit/parser/ast/function_spec.rb
@@ -48,7 +48,7 @@ describe Puppet::Parser::AST::Function do
lambda{ func.evaluate(@scope) }.should raise_error(Puppet::ParseError,"Function 'exist' must be the value of a statement")
end
- it "should evaluate its arguments" do
+ it "should evaluate its arguments", :'fails_on_ruby_1.9.2' => true do
argument = stub 'arg'
Puppet::Parser::Functions.stubs(:function).with("exist").returns(true)
func = Puppet::Parser::AST::Function.new :name => "exist", :ftype => :statement, :arguments => argument
diff --git a/spec/unit/parser/ast/selector_spec.rb b/spec/unit/parser/ast/selector_spec.rb
index 1bf5f6757..76afec271 100755
--- a/spec/unit/parser/ast/selector_spec.rb
+++ b/spec/unit/parser/ast/selector_spec.rb
@@ -6,7 +6,7 @@ describe Puppet::Parser::AST::Selector do
@scope = Puppet::Parser::Scope.new
end
- describe "when evaluating" do
+ describe "when evaluating", :'fails_on_ruby_1.9.2' => true do
before :each do
@param = stub 'param'