summaryrefslogtreecommitdiffstats
path: root/spec/unit/util/queue
diff options
context:
space:
mode:
authorPieter van de Bruggen <pieter@puppetlabs.com>2011-05-17 15:01:26 -0700
committerPieter van de Bruggen <pieter@puppetlabs.com>2011-05-17 15:01:26 -0700
commit51855e7f17877871aa8ec4f1ed7226c1d95ce66b (patch)
tree3c5522df6b0038a8cf85e80bfb0737af5aa9ec2d /spec/unit/util/queue
parent3b4fd7a2a44873d3dd4afb882a381a2218e8a0e9 (diff)
parentf9e44f041b3fdc120b1c78554c35c83f7517152e (diff)
Merge branch '2.7.next' into next
Diffstat (limited to 'spec/unit/util/queue')
-rwxr-xr-xspec/unit/util/queue/stomp_spec.rb4
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.