CHEF-5022: leave enabled to nil for all other states

2 files changed, 13 insertions, 1 deletions

diff --git a/lib/chef/provider/service/windows.rb b/lib/chef/provider/service/windows.rb
index ff80279038..5123edbea0 100644
--- a/lib/chef/provider/service/windows.rb
+++ b/lib/chef/provider/service/windows.rb
@@ -50,7 +50,12 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service
     @current_resource.service_name(@new_resource.service_name)
     @current_resource.running(current_state == RUNNING)
     Chef::Log.debug "#{@new_resource} running: #{@current_resource.running}"
-    @current_resource.enabled(start_type != DISABLED)
+    case start_type
+    when AUTO_START
+      @current_resource.enabled(true)
+    when DISABLED
+      @current_resource.enabled(false)
+    end
     Chef::Log.debug "#{@new_resource} enabled: #{@current_resource.enabled}"
     @current_resource
   end
diff --git a/spec/unit/provider/service/windows_spec.rb b/spec/unit/provider/service/windows_spec.rb
index b303a35ff9..0c71d0ff41 100644
--- a/spec/unit/provider/service/windows_spec.rb
+++ b/spec/unit/provider/service/windows_spec.rb
@@ -59,6 +59,13 @@ describe Chef::Provider::Service::Windows, "load_current_resource" do
     @provider.current_resource.enabled.should be_true
   end
 
+  it "does not set the current resources start type if it is neither AUTO START or DISABLED" do
+    Win32::Service.stub(:config_info).with(@new_resource.service_name).and_return(
+      double("ConfigStruct", :start_type => "manual"))
+    @provider.load_current_resource
+    @provider.current_resource.enabled.should be_nil
+  end
+
   describe Chef::Provider::Service::Windows, "start_service" do
     before(:each) do
       Win32::Service.stub(:status).with(@new_resource.service_name).and_return(