diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-05-17 10:16:03 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-05-17 10:16:03 -0700 |
| commit | 5457c70a66ef95482391e39e43f1fa99ac83e721 (patch) | |
| tree | 4404cb2a154461798374e93f99d989325a1a76d4 /spec/unit/util/queue | |
| parent | 009c961ec6e71621cd984b98a5d4e3c855dbaee4 (diff) | |
| parent | 9da1454e71b8330e929ac5616eefa44388c90832 (diff) | |
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/util/queue')
| -rwxr-xr-x | spec/unit/util/queue/stomp_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/unit/util/queue/stomp_spec.rb b/spec/unit/util/queue/stomp_spec.rb index 99c77d0b4..6799becea 100755 --- a/spec/unit/util/queue/stomp_spec.rb +++ b/spec/unit/util/queue/stomp_spec.rb @@ -2,14 +2,14 @@ require 'spec_helper' require 'puppet/util/queue' -describe Puppet::Util::Queue, :if => Puppet.features.stomp? do +describe Puppet::Util::Queue, :if => Puppet.features.stomp?, :'fails_on_ruby_1.9.2' => true do it 'should load :stomp client appropriately' do Puppet.settings.stubs(:value).returns 'faux_queue_source' Puppet::Util::Queue.queue_type_to_class(:stomp).name.should == 'Puppet::Util::Queue::Stomp' end end -describe 'Puppet::Util::Queue::Stomp', :if => Puppet.features.stomp? do +describe 'Puppet::Util::Queue::Stomp', :if => Puppet.features.stomp?, :'fails_on_ruby_1.9.2' => true do before do # So we make sure we never create a real client instance. # Otherwise we'll try to connect, and that's bad. |
