summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorRick Bradley <rick@rickbradley.com>2007-10-16 15:52:41 -0500
committerRick Bradley <rick@rickbradley.com>2007-10-16 15:52:41 -0500
commit6cd0f371065da901d8cc3143d8859a389ca87582 (patch)
tree2ffae608bfc8d88a6d48a85607c6ef83330f16bb /lib/puppet
parent216dd8c47ea42338c2dee0bf6528cdd7e37e0028 (diff)
downloadpuppet-6cd0f371065da901d8cc3143d8859a389ca87582.tar.gz
puppet-6cd0f371065da901d8cc3143d8859a389ca87582.tar.xz
puppet-6cd0f371065da901d8cc3143d8859a389ca87582.zip
Make it possible to run all tests even if mongrel isn't installed. Shouldn't "confine" produce some output when running spec? Who knows.
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/network/http/mongrel.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/network/http/mongrel.rb b/lib/puppet/network/http/mongrel.rb
index 3efc465ad..8ea669531 100644
--- a/lib/puppet/network/http/mongrel.rb
+++ b/lib/puppet/network/http/mongrel.rb
@@ -1,4 +1,5 @@
-require 'mongrel'
+require 'mongrel' if Puppet.features.mongrel?
+
require 'puppet/network/http/mongrel/rest'
require 'puppet/network/http/mongrel/xmlrpc'