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/unit/application | |
| parent | ac114371fc161a48fc48bf68944846a1defbc6c4 (diff) | |
| parent | 52760a4fb2764d011609c82adb68cc61d0772dc4 (diff) | |
| download | puppet-a05df9fec9040a908f28e4c324845ec80daa54eb.tar.gz puppet-a05df9fec9040a908f28e4c324845ec80daa54eb.tar.xz puppet-a05df9fec9040a908f28e4c324845ec80daa54eb.zip | |
Merge branch 'ticket/2.6.next/upgrade_rspec' into 2.6.next
Diffstat (limited to 'spec/unit/application')
| -rwxr-xr-x | spec/unit/application/kick_spec.rb | 4 | ||||
| -rw-r--r-- | spec/unit/application/master_spec.rb | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/spec/unit/application/kick_spec.rb b/spec/unit/application/kick_spec.rb index dea7ec147..c18a84de3 100755 --- a/spec/unit/application/kick_spec.rb +++ b/spec/unit/application/kick_spec.rb @@ -4,9 +4,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' require 'puppet/application/kick' -describe Puppet::Application::Kick do - - confine "Kick's eventloops can only start on POSIX" => Puppet.features.posix? +describe Puppet::Application::Kick, :if => Puppet.features.posix? do before :each do require 'puppet/util/ldap/connection' diff --git a/spec/unit/application/master_spec.rb b/spec/unit/application/master_spec.rb index 216c7dc90..074249a4d 100644 --- a/spec/unit/application/master_spec.rb +++ b/spec/unit/application/master_spec.rb @@ -412,9 +412,7 @@ describe Puppet::Application::Master do @master.main end - describe "with --rack" do - confine "Rack is not available" => Puppet.features.rack? - + describe "with --rack", :if => Puppet.features.rack? do before do require 'puppet/network/http/rack' Puppet::Network::HTTP::Rack.stubs(:new).returns(@app) |