summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Helwig <jacob@puppetlabs.com>2011-07-12 15:26:32 -0700
committerJacob Helwig <jacob@puppetlabs.com>2011-08-19 13:52:57 -0700
commitc93015264f8778baf6ba309064ab5a8ab16f32bc (patch)
tree0417e4f21d5a0358a4e146c628e8996bacfb0611
parent28b16584d13399f911577a47a355e866d8601085 (diff)
downloadpuppet-c93015264f8778baf6ba309064ab5a8ab16f32bc.tar.gz
puppet-c93015264f8778baf6ba309064ab5a8ab16f32bc.tar.xz
puppet-c93015264f8778baf6ba309064ab5a8ab16f32bc.zip
(#8392) Disable master related tests on Windows
The master, and queue applications are not used for agent functionality and since only agent functionality is supported on Windows, these tests do not need to run. Reviewed-by: Josh Cooper <josh@puppetlabs.com> (cherry picked from commit a521b99b2267e4c2588ceb6b90d36cab5af83aa6)
-rwxr-xr-xspec/unit/application/master_spec.rb2
-rwxr-xr-xspec/unit/application/queue_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/unit/application/master_spec.rb b/spec/unit/application/master_spec.rb
index 636988fd0..c6df48f4d 100755
--- a/spec/unit/application/master_spec.rb
+++ b/spec/unit/application/master_spec.rb
@@ -5,7 +5,7 @@ require 'puppet/application/master'
require 'puppet/daemon'
require 'puppet/network/server'
-describe Puppet::Application::Master, :fails_on_windows => true do
+describe Puppet::Application::Master, :unless => Puppet.features.microsoft_windows? do
before :each do
@master = Puppet::Application[:master]
@daemon = stub_everything 'daemon'
diff --git a/spec/unit/application/queue_spec.rb b/spec/unit/application/queue_spec.rb
index 15e3927a1..d861383a6 100755
--- a/spec/unit/application/queue_spec.rb
+++ b/spec/unit/application/queue_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
require 'puppet/application/queue'
require 'puppet/indirector/catalog/queue'
-describe Puppet::Application::Queue do
+describe Puppet::Application::Queue, :unless => Puppet.features.microsoft_windows? do
before :each do
@queue = Puppet::Application[:queue]
@queue.stubs(:puts)