diff options
| author | Kartik Null Cating-Subramanian <ksubramanian@chef.io> | 2015-07-14 11:58:21 -0400 |
|---|---|---|
| committer | Kartik Null Cating-Subramanian <ksubramanian@chef.io> | 2015-07-20 12:23:45 -0400 |
| commit | 23dc9708d60e7db1b894fa1027d1f8d1da7baca1 (patch) | |
| tree | 0114e6ef05bc5f2db6e5fedfc0ce9925714a06e4 | |
| parent | de5fd05da851af01e960266feda9ce74b03e9bc6 (diff) | |
| download | chef-23dc9708d60e7db1b894fa1027d1f8d1da7baca1.tar.gz | |
Make service manager tests pass.
| -rw-r--r-- | lib/chef/application/windows_service_manager.rb | 2 | ||||
| -rw-r--r-- | spec/functional/win32/service_manager_spec.rb | 2 | ||||
| -rw-r--r-- | spec/support/shared/functional/win32_service.rb | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/lib/chef/application/windows_service_manager.rb b/lib/chef/application/windows_service_manager.rb index 97db7ee56f..9bd6095260 100644 --- a/lib/chef/application/windows_service_manager.rb +++ b/lib/chef/application/windows_service_manager.rb @@ -128,7 +128,7 @@ class Chef ::Win32::Service.configure( :service_name => @service_name, :delayed_start => @delayed_start - ) + ) unless @delayed_start.nil? puts "Service '#{@service_name}' has successfully been installed." end when 'status' diff --git a/spec/functional/win32/service_manager_spec.rb b/spec/functional/win32/service_manager_spec.rb index c6c863ffd9..a1ce36146f 100644 --- a/spec/functional/win32/service_manager_spec.rb +++ b/spec/functional/win32/service_manager_spec.rb @@ -43,7 +43,7 @@ describe "Chef::Application::WindowsServiceManager", :windows_only, :system_wind end it "throws an error with required missing options" do - test_service.each do |key,value| + [:service_name, :service_display_name, :service_description, :service_file_path].each do |key| service_def = test_service.dup service_def.delete(key) diff --git a/spec/support/shared/functional/win32_service.rb b/spec/support/shared/functional/win32_service.rb index 7dd1920418..2ee1a8ad88 100644 --- a/spec/support/shared/functional/win32_service.rb +++ b/spec/support/shared/functional/win32_service.rb @@ -46,7 +46,8 @@ shared_context "using Win32::Service" do :service_name => "spec-service", :service_display_name => "Spec Test Service", :service_description => "Service for testing Chef::Application::WindowsServiceManager.", - :service_file_path => File.expand_path(File.join(File.dirname(__FILE__), '../../platforms/win32/spec_service.rb')) + :service_file_path => File.expand_path(File.join(File.dirname(__FILE__), '../../platforms/win32/spec_service.rb')), + :delayed_start => true } } |