diff options
| author | Thom May <thom@may.lt> | 2015-07-17 17:12:04 +0100 |
|---|---|---|
| committer | Thom May <thom@may.lt> | 2015-07-17 17:12:04 +0100 |
| commit | 219c7e1a54d283118ae7f1f12966c61e9bbd06b1 (patch) | |
| tree | e8b8bc09effd3f0f310952bcbf8fcae34702d3a3 | |
| parent | 943bcdeb5ec0911ff0a0d2d9841d7060b3b6f963 (diff) | |
| parent | 220a0f120879cab95e5db4846e5fa62d74c5a3d7 (diff) | |
| download | chef-219c7e1a54d283118ae7f1f12966c61e9bbd06b1.tar.gz | |
Merge pull request #3680 from chef/tm/service_appveyor_only
avoid windows service spec unless we're on appveyor
| -rw-r--r-- | spec/functional/win32/service_manager_spec.rb | 2 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/spec/functional/win32/service_manager_spec.rb b/spec/functional/win32/service_manager_spec.rb index d2474deace..c6c863ffd9 100644 --- a/spec/functional/win32/service_manager_spec.rb +++ b/spec/functional/win32/service_manager_spec.rb @@ -33,7 +33,7 @@ end # directories. # -describe "Chef::Application::WindowsServiceManager", :windows_only, :system_windows_service_gem_only do +describe "Chef::Application::WindowsServiceManager", :windows_only, :system_windows_service_gem_only, :appveyor_only do include_context "using Win32::Service" diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 8e24e03e9f..3b55ba9de0 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -118,6 +118,7 @@ RSpec.configure do |config| config.filter_run_excluding :volatile_from_verify => false config.filter_run_excluding :skip_appveyor => true if ENV["APPVEYOR"] + config.filter_run_excluding :appveyor_only => true unless ENV["APPVEYOR"] config.filter_run_excluding :windows_only => true unless windows? config.filter_run_excluding :not_supported_on_mac_osx_106 => true if mac_osx_106? |