diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-01-05 15:54:00 -0800 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-01-05 15:54:00 -0800 |
| commit | 19eb1e78e115d10bfb822e510213e4fab9cd2599 (patch) | |
| tree | d5068dfd7a3890c7b5961779c87681b930cf3144 /spec/integration/network/server | |
| parent | cc1f2b39a65e8b74c8e59a2bf7d8f47a35985ee4 (diff) | |
| parent | 83ac3e789ddc8dbf40c93460032474870fb16c54 (diff) | |
Merge branch '2.6.next' into 2.6.x
Diffstat (limited to 'spec/integration/network/server')
| -rwxr-xr-x | spec/integration/network/server/mongrel_spec.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/integration/network/server/mongrel_spec.rb b/spec/integration/network/server/mongrel_spec.rb index cc90773e6..c2815b565 100755 --- a/spec/integration/network/server/mongrel_spec.rb +++ b/spec/integration/network/server/mongrel_spec.rb @@ -5,8 +5,7 @@ require 'puppet/network/server' require 'socket' describe Puppet::Network::Server do - describe "when using mongrel" do - confine "Mongrel is not available" => Puppet.features.mongrel? + describe "when using mongrel", :if => Puppet.features.mongrel? do before :each do Puppet[:servertype] = 'mongrel' |