Merge branch 'ticket/2.7.x/7507-filter_19_failures' into 2.7.x

* ticket/2.7.x/7507-filter_19_failures:
  (#7507) Add ability to filter Ruby 1.9 spec failures
  (#7507) Fix when_invoked action specs in Ruby 1.9

8 files changed, 12 insertions, 12 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'
diff --git a/spec/unit/parser/compiler_spec.rb b/spec/unit/parser/compiler_spec.rb
index f4cf8b3a1..9ad754ad8 100755
--- a/spec/unit/parser/compiler_spec.rb
+++ b/spec/unit/parser/compiler_spec.rb
@@ -609,7 +609,7 @@ describe Puppet::Parser::Compiler do
       @compiler.evaluate_classes(%w{myclass}, @scope)
     end
 
-    it "should ensure each node class hash is in catalog and have appropriate parameters" do
+    it "should ensure each node class hash is in catalog and have appropriate parameters", :'fails_on_ruby_1.9.2' => true do
       klasses = {'foo'=>{'1'=>'one'}, 'bar::foo'=>{'2'=>'two'}, 'bar'=>{'1'=> [1,2,3], '2'=>{'foo'=>'bar'}}}
       @node.classes = klasses
       ast_obj = Puppet::Parser::AST::String.new(:value => 'foo')
@@ -633,7 +633,7 @@ describe Puppet::Parser::Compiler do
       r2.tags.should =~ ['class', 'bar']
     end
 
-    it "should ensure each node class is in catalog and has appropriate tags" do
+    it "should ensure each node class is in catalog and has appropriate tags", :'fails_on_ruby_1.9.2' => true do
       klasses = ['bar::foo']
       @node.classes = klasses
       ast_obj = Puppet::Parser::AST::String.new(:value => 'foo')
diff --git a/spec/unit/parser/functions/create_resources_spec.rb b/spec/unit/parser/functions/create_resources_spec.rb
index 88a67e369..da76e75d0 100755
--- a/spec/unit/parser/functions/create_resources_spec.rb
+++ b/spec/unit/parser/functions/create_resources_spec.rb
@@ -114,7 +114,7 @@ notify{tester:}
       @scope.resource=Puppet::Parser::Resource.new('class', 't', :scope => @scope)
       Puppet::Parser::Functions.function(:create_resources)
     end
-    it 'should be able to create classes' do
+    it 'should be able to create classes', :'fails_on_ruby_1.9.2' => true do
       @scope.function_create_resources(['class', {'bar'=>{'one'=>'two'}}])
       @scope.compiler.compile
       @compiler.catalog.resource(:notify, "test")['message'].should == 'two'
@@ -123,7 +123,7 @@ notify{tester:}
     it 'should fail to create non-existing classes' do
       lambda { @scope.function_create_resources(['class', {'blah'=>{'one'=>'two'}}]) }.should raise_error(ArgumentError ,'could not find hostclass blah')
     end
-    it 'should be able to add edges' do
+    it 'should be able to add edges', :'fails_on_ruby_1.9.2' => true do
       @scope.function_create_resources(['class', {'bar'=>{'one'=>'two', 'require' => 'Notify[tester]'}}])
       @scope.compiler.compile
       rg = @scope.compiler.catalog.to_ral.relationship_graph
diff --git a/spec/unit/parser/functions/inline_template_spec.rb b/spec/unit/parser/functions/inline_template_spec.rb
index a9ac0c2d0..47dcae15e 100755
--- a/spec/unit/parser/functions/inline_template_spec.rb
+++ b/spec/unit/parser/functions/inline_template_spec.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
 
-describe "the inline_template function" do
+describe "the inline_template function", :'fails_on_ruby_1.9.2' => true do
   before :all do
     Puppet::Parser::Functions.autoloader.loadall
   end
diff --git a/spec/unit/parser/functions/shellquote_spec.rb b/spec/unit/parser/functions/shellquote_spec.rb
index b100b4913..bfa2969ea 100755
--- a/spec/unit/parser/functions/shellquote_spec.rb
+++ b/spec/unit/parser/functions/shellquote_spec.rb
@@ -53,7 +53,7 @@ describe "the shellquote function" do
     result.should(eql( "'$PATH' 'foo$bar' '\"x$\"'"))
   end
 
-  it "should deal with apostrophes (single quotes)" do
+  it "should deal with apostrophes (single quotes)", :'fails_on_ruby_1.9.2' => true do
     result = @scope.function_shellquote(
       ["'foo'bar'", "`$'EDITOR'`"])
     result.should(eql(
@@ -65,12 +65,12 @@ describe "the shellquote function" do
     result.should(eql( "'`echo *`' '`ls \"$MAILPATH\"`'"))
   end
 
-  it "should deal with both single and double quotes" do
+  it "should deal with both single and double quotes", :'fails_on_ruby_1.9.2' => true do
     result = @scope.function_shellquote( ['\'foo"bar"xyzzy\'', '"foo\'bar\'xyzzy"'])
     result.should(eql( '"\'foo\\"bar\\"xyzzy\'" "\\"foo\'bar\'xyzzy\\""'))
   end
 
-  it "should handle multiple quotes *and* dollars and backquotes" do
+  it "should handle multiple quotes *and* dollars and backquotes", :'fails_on_ruby_1.9.2' => true do
     result = @scope.function_shellquote( ['\'foo"$x`bar`"xyzzy\''])
     result.should(eql( '"\'foo\\"\\$x\\`bar\\`\\"xyzzy\'"'))
   end
diff --git a/spec/unit/parser/functions/template_spec.rb b/spec/unit/parser/functions/template_spec.rb
index e7ee974d3..6bce69534 100755
--- a/spec/unit/parser/functions/template_spec.rb
+++ b/spec/unit/parser/functions/template_spec.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
 
-describe "the template function" do
+describe "the template function", :'fails_on_ruby_1.9.2' => true do
   before :all do
     Puppet::Parser::Functions.autoloader.loadall
   end
diff --git a/spec/unit/parser/resource_spec.rb b/spec/unit/parser/resource_spec.rb
index b03c18e5f..064f27514 100755
--- a/spec/unit/parser/resource_spec.rb
+++ b/spec/unit/parser/resource_spec.rb
@@ -113,7 +113,7 @@ describe Puppet::Parser::Resource do
       @arguments = {:scope => @scope}
     end
 
-    it "should fail unless #{name.to_s} is specified" do
+    it "should fail unless #{name.to_s} is specified", :'fails_on_ruby_1.9.2' => true do
       lambda { Puppet::Parser::Resource.new('file', '/my/file') }.should raise_error(ArgumentError)
     end