diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-01-04 16:04:34 -0800 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-01-04 16:04:34 -0800 |
| commit | a05df9fec9040a908f28e4c324845ec80daa54eb (patch) | |
| tree | 489df98ee50d6ac6cf01fb905e78bd4864cde2c0 /spec/integration/network/server | |
| parent | ac114371fc161a48fc48bf68944846a1defbc6c4 (diff) | |
| parent | 52760a4fb2764d011609c82adb68cc61d0772dc4 (diff) | |
Merge branch 'ticket/2.6.next/upgrade_rspec' into 2.6.next
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' |