summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2009-08-10 04:10:51 +0000
committerJames Turnbull <james@lovedthanlost.net>2009-08-10 17:39:39 +1000
commitacc5a964738871539cf38675ad3b56d512d3c860 (patch)
tree889e28cb104c04ce11eafa6c65277269fd317d1a /lib/puppet
parent1a5c5b3fdbcf705d1fcd16f8f26e2b0f85b9e160 (diff)
downloadpuppet-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 'lib/puppet')
-rw-r--r--lib/puppet/indirector/queue.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/puppet/indirector/queue.rb b/lib/puppet/indirector/queue.rb
index 1fc72d6c1..3a70496a3 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