All of the tests were failing because we had a call outside of any of the tests, just to autoload the constant. Removed that call and stubbed things so the tests don't run without json.
Signed-off-by: Luke Kanies <[email protected]> --- lib/puppet/indirector/queue.rb | 1 - spec/integration/indirector/catalog/queue.rb | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/puppet/indirector/queue.rb b/lib/puppet/indirector/queue.rb index 1fc72d6..3a70496 100644 --- a/lib/puppet/indirector/queue.rb +++ b/lib/puppet/indirector/queue.rb @@ -1,7 +1,6 @@ require 'puppet/indirector/terminus' require 'puppet/util/queue' require 'puppet/util' -require 'json' # Implements the <tt>:queue</tt> abstract indirector terminus type, for storing # model instances to a message queue, presumably for the purpose of out-of-process diff --git a/spec/integration/indirector/catalog/queue.rb b/spec/integration/indirector/catalog/queue.rb index 22f29aa..bf12181 100755 --- a/spec/integration/indirector/catalog/queue.rb +++ b/spec/integration/indirector/catalog/queue.rb @@ -4,10 +4,12 @@ Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f require 'puppet/resource/catalog' -Puppet::Resource::Catalog.indirection.terminus(:queue) -describe Puppet::Resource::Catalog::Queue do +describe "Puppet::Resource::Catalog::Queue" do + confine "Missing json support; cannot test queue" => Puppet.features.json? + before do + Puppet::Resource::Catalog.indirection.terminus(:queue) @catalog = Puppet::Resource::Catalog.new @one = Puppet::Resource.new(:file, "/one") -- 1.6.1 --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en -~----------~----~----~----~------~----~------~--~---
