diff options
author | Jacob Helwig <jacob@puppetlabs.com> | 2011-07-12 15:26:32 -0700 |
---|---|---|
committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-07-27 15:09:32 -0700 |
commit | a521b99b2267e4c2588ceb6b90d36cab5af83aa6 (patch) | |
tree | 30856f2a645d7c1877afe4b3b6d935e4f1fd4649 /spec/unit | |
parent | 5b167eba2b602f5c6c6c224790fa1eb56b239ad4 (diff) | |
download | puppet-a521b99b2267e4c2588ceb6b90d36cab5af83aa6.tar.gz puppet-a521b99b2267e4c2588ceb6b90d36cab5af83aa6.tar.xz puppet-a521b99b2267e4c2588ceb6b90d36cab5af83aa6.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>
Diffstat (limited to 'spec/unit')
-rwxr-xr-x | spec/unit/application/master_spec.rb | 2 | ||||
-rwxr-xr-x | spec/unit/application/queue_spec.rb | 2 |
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) |