Merge pull request puppetlabs#2 from tphoney/enable_disable

enable / disable tests

Author: tphoney

spec/acceptance/init_spec.rb

@@ -6,28 +6,44 @@
     apply_manifest('package { "ntp": ensure => present, }')
     sleep(6)
   end
-  describe 'stop' do
-    it 'stop a service' do
+  describe 'stop action' do
+    it 'stop/status a service' do
       result = run_puppet_task(task_name: 'service', params: { 'action' => 'stop', 'service' => 'ntpd' })
-      expect_multiple_regexes(result: result, regexes: [%r{status : stopped}, %r{Job completed. 1/1 nodes succeeded}])
+      expect_multiple_regexes(result: result, regexes: [%r{status : in_sync}, %r{Job completed. 1/1 nodes succeeded}])
       result = run_puppet_task(task_name: 'service', params: { 'action' => 'status', 'service' => 'ntpd' })
       expect_multiple_regexes(result: result, regexes: [%r{status : stopped}, %r{enabled : false}, %r{Job completed. 1/1 nodes succeeded}])
     end
   end
-  describe 'start' do
-    it 'start a service' do
+  describe 'start action' do
+    it 'start/status a service' do
       result = run_puppet_task(task_name: 'service', params: { 'action' => 'start', 'service' => 'ntpd' })
       expect_multiple_regexes(result: result, regexes: [%r{status : started}, %r{Job completed. 1/1 nodes succeeded}])
       result = run_puppet_task(task_name: 'service', params: { 'action' => 'status', 'service' => 'ntpd' })
       expect_multiple_regexes(result: result, regexes: [%r{status : running}, %r{enabled : false}, %r{Job completed. 1/1 nodes succeeded}])
     end
   end
-  describe 'restart' do
-    it 'restart a service' do
+  describe 'restart action' do
+    it 'restart/status a service' do
       result = run_puppet_task(task_name: 'service', params: { 'action' => 'restart', 'service' => 'ntpd' })
       expect_multiple_regexes(result: result, regexes: [%r{status : restarted}, %r{Job completed. 1/1 nodes succeeded}])
       result = run_puppet_task(task_name: 'service', params: { 'action' => 'status', 'service' => 'ntpd' })
       expect_multiple_regexes(result: result, regexes: [%r{status : running}, %r{enabled : false}, %r{Job completed. 1/1 nodes succeeded}])
     end
   end
+  describe 'enable action' do
+    it 'enable/status a service' do
+      result = run_puppet_task(task_name: 'service', params: { 'action' => 'enable', 'service' => 'ntpd' })
+      expect_multiple_regexes(result: result, regexes: [%r{status : enabled}, %r{Job completed. 1/1 nodes succeeded}])
+      result = run_puppet_task(task_name: 'service', params: { 'action' => 'status', 'service' => 'ntpd' })
+      expect_multiple_regexes(result: result, regexes: [%r{status : running}, %r{enabled : true}, %r{Job completed. 1/1 nodes succeeded}])
+    end
+  end
+  describe 'disable action' do
+    it 'enable/status a service' do
+      result = run_puppet_task(task_name: 'service', params: { 'action' => 'disable', 'service' => 'ntpd' })
+      expect_multiple_regexes(result: result, regexes: [%r{status : disabled}, %r{Job completed. 1/1 nodes succeeded}])
+      result = run_puppet_task(task_name: 'service', params: { 'action' => 'status', 'service' => 'ntpd' })
+      expect_multiple_regexes(result: result, regexes: [%r{status : running}, %r{enabled : false}, %r{Job completed. 1/1 nodes succeeded}])
+    end
+  end
 end

tasks/init

@@ -31,7 +31,7 @@ def status(provider)
 end
 
 def enable(provider)
-  if provider.enabled?
+  if provider.enabled?.to_s == 'true'
     { status: 'in_sync' }
   else
     provider.enable
@@ -40,7 +40,7 @@ def enable(provider)
 end
 
 def disable(provider)
-  if provider.enabled?
+  if provider.enabled?.to_s == 'true'
     provider.disable
     { status: 'disabled' }
   else