diff options
author | John Keiser <john@johnkeiser.com> | 2016-08-23 11:02:05 -0700 |
---|---|---|
committer | John Keiser <john@johnkeiser.com> | 2016-08-24 17:54:24 -0700 |
commit | 39936bb3476020eb1dfb5612c3359e0ed6579b23 (patch) | |
tree | 57dc80d7a3727fb304fde45a2453a8e9ed572ace | |
parent | 305ab4ceac199d4366fb58c892ec2eef5d55b137 (diff) | |
download | chef-39936bb3476020eb1dfb5612c3359e0ed6579b23.tar.gz |
Get rid of "can't find win32 dll" warning in tests on non-Windows platforms
-rw-r--r-- | spec/spec_helper.rb | 2 | ||||
-rw-r--r-- | spec/support/chef_helpers.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 47a5ec7f9f..e569541a6d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -150,7 +150,7 @@ RSpec.configure do |config| config.filter_run_excluding :windows_domain_joined_only => true unless windows_domain_joined? config.filter_run_excluding :windows_not_domain_joined_only => true if windows_domain_joined? config.filter_run_excluding :solaris_only => true unless solaris? - config.filter_run_excluding :system_windows_service_gem_only => true unless system_windows_service_gem? + config.filter_run_excluding :system_windows_service_gem_only => true unless windows? && system_windows_service_gem? config.filter_run_excluding :unix_only => true unless unix? config.filter_run_excluding :linux_only => true unless linux? config.filter_run_excluding :aix_only => true unless aix? diff --git a/spec/support/chef_helpers.rb b/spec/support/chef_helpers.rb index d0b5ad0bfd..5df7bdcaf7 100644 --- a/spec/support/chef_helpers.rb +++ b/spec/support/chef_helpers.rb @@ -66,7 +66,7 @@ end # win32/service gem. windows_service_manager tests create a windows # service that starts with the system ruby and requires this gem. def system_windows_service_gem? - windows_service_gem_check_command = %q{ruby -r "win32/daemon" -e ":noop"} + windows_service_gem_check_command = %q{gem which win32/daemon} if defined?(Bundler) Bundler.with_clean_env do # This returns true if the gem can be loaded |