diff options
| author | Luke Kanies <luke@madstop.com> | 2009-08-10 04:10:51 +0000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-08-10 17:39:39 +1000 |
| commit | acc5a964738871539cf38675ad3b56d512d3c860 (patch) | |
| tree | 889e28cb104c04ce11eafa6c65277269fd317d1a /spec/integration/indirector | |
| parent | 1a5c5b3fdbcf705d1fcd16f8f26e2b0f85b9e160 (diff) | |
| download | puppet-acc5a964738871539cf38675ad3b56d512d3c860.tar.gz puppet-acc5a964738871539cf38675ad3b56d512d3c860.tar.xz puppet-acc5a964738871539cf38675ad3b56d512d3c860.zip | |
Fixing #2489 - queue integration tests are skipped w/out json
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 <luke@madstop.com>
Diffstat (limited to 'spec/integration/indirector')
| -rwxr-xr-x | spec/integration/indirector/catalog/queue.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/integration/indirector/catalog/queue.rb b/spec/integration/indirector/catalog/queue.rb index 22f29aac3..bf121811c 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") |