[CHEF-1794] use remove instead of disable for disabling a debian service

Author: thbishop

chef/lib/chef/provider/service/debian.rb

@@ -29,25 +29,17 @@ class Debian < Chef::Provider::Service::Init
 
         def load_current_resource
           super
-          
-          @current_resource.enabled(service_currently_enabled?)
-          @current_resource        
-        end
 
-        def enable_service()
-          run_command(:command => "/usr/sbin/update-rc.d #{@new_resource.service_name} defaults")
+          @current_resource.enabled(service_currently_enabled?)
+          @current_resource
         end
 
-        def disable_service()
-          run_command(:command => "/usr/sbin/update-rc.d -f #{@new_resource.service_name} remove")
-        end
-        
         def assert_update_rcd_available
           unless ::File.exists? "/usr/sbin/update-rc.d"
             raise Chef::Exceptions::Service, "/usr/sbin/update-rc.d does not exist!"
           end
         end
-        
+
         def service_currently_enabled?
           assert_update_rcd_available
 
@@ -67,7 +59,7 @@ def service_currently_enabled?
             end
             @current_resource.enabled enabled
             @current_resource.priority priority
-          end  
+          end
 
           unless status.exitstatus == 0
             raise Chef::Exceptions::Service, "/usr/sbin/update-rc.d -n -f #{@current_resource.service_name} failed - #{status.inspect}"
@@ -96,11 +88,9 @@ def enable_service()
         end
 
         def disable_service()
-          run_command(:command => "/usr/sbin/update-rc.d #{@new_resource.service_name} disable")
-#          @new_resource.priority({2 => [:stop, 80]})
-#          enable_service
+          run_command(:command => "/usr/sbin/update-rc.d -f #{@new_resource.service_name} remove")
         end
-        
+
       end
     end
   end

chef/spec/unit/provider/service/debian_service_spec.rb

@@ -40,6 +40,37 @@
     lambda { @provider.assert_update_rcd_available }.should raise_error(Chef::Exceptions::Service)
   end
 
+  describe "when update-rc.d shows the init script linked to rc*.d/" do
+    before do
+      @provider.stub!(:run_command)
+      @provider.stub!(:assert_update_rcd_available)
+      @status = mock("Status", :exitstatus => 0)
+
+      result=<<-UPDATE_RC_D_SUCCESS
+Removing any system startup links for /etc/init.d/chef ...
+  /etc/rc0.d/K20chef
+  /etc/rc1.d/K20chef
+  /etc/rc2.d/S20chef
+  /etc/rc3.d/S20chef
+  /etc/rc4.d/S20chef
+  /etc/rc5.d/S20chef
+  /etc/rc6.d/K20chef
+  UPDATE_RC_D_SUCCESS
+      @stdout = StringIO.new(result)
+      @stderr = StringIO.new
+      @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+    end
+
+    it "says the service is enabled" do
+      @provider.service_currently_enabled?.should be_true
+    end
+
+    it "stores the 'enabled' state" do
+      Chef::Resource::Service.stub!(:new).and_return(@current_resource)
+      @provider.load_current_resource.should equal(@current_resource)
+      @current_resource.enabled.should be_true
+    end
+  end
 
   {"Debian/Lenny and older" => {
       "linked" => {
@@ -132,6 +163,27 @@
     end
   end
 
+  describe "when update-rc.d shows the init script isn't linked to rc*.d" do
+    before do
+      @provider.stub!(:run_command)
+      @provider.stub!(:assert_update_rcd_available)
+      @status = mock("Status", :exitstatus => 0)
+      @stdout = StringIO.new(" Removing any system startup links for /etc/init.d/chef ...")
+      @stderr = StringIO.new
+      @provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+    end
+
+    it "says the service is disabled" do
+      @provider.service_currently_enabled?.should be_false
+    end
+
+    it "stores the 'disabled' state" do
+      Chef::Resource::Service.stub!(:new).and_return(@current_resource)
+      @provider.load_current_resource.should equal(@current_resource)
+      @current_resource.enabled.should be_false
+    end
+  end
+
   describe "when update-rc.d fails" do
     before do
       @status = mock("Status", :exitstatus => -1)
@@ -173,8 +225,8 @@
   end
 
   describe "when disabling a service" do
-    it "should call update-rc.d 'service_name' disable" do
-      @provider.should_receive(:run_command).with({:command => "/usr/sbin/update-rc.d #{@new_resource.service_name} disable"})
+    it "should call update-rc.d -f 'service_name' remove" do
+      @provider.should_receive(:run_command).with({:command => "/usr/sbin/update-rc.d -f #{@new_resource.service_name} remove"})
       @provider.disable_service()
     end
   end