summaryrefslogtreecommitdiffstats
path: root/spec/unit/parser/compiler_spec.rb
diff options
context:
space:
mode:
authorMatt Robinson <matt@puppetlabs.com>2011-05-17 10:16:03 -0700
committerMatt Robinson <matt@puppetlabs.com>2011-05-17 10:16:03 -0700
commit5457c70a66ef95482391e39e43f1fa99ac83e721 (patch)
tree4404cb2a154461798374e93f99d989325a1a76d4 /spec/unit/parser/compiler_spec.rb
parent009c961ec6e71621cd984b98a5d4e3c855dbaee4 (diff)
parent9da1454e71b8330e929ac5616eefa44388c90832 (diff)
downloadpuppet-5457c70a66ef95482391e39e43f1fa99ac83e721.tar.gz
puppet-5457c70a66ef95482391e39e43f1fa99ac83e721.tar.xz
puppet-5457c70a66ef95482391e39e43f1fa99ac83e721.zip
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
Diffstat (limited to 'spec/unit/parser/compiler_spec.rb')
-rwxr-xr-xspec/unit/parser/compiler_spec.rb4
1 files changed, 2 insertions, 2 deletions
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')