summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-07-26 15:58:31 -0700
committerJacob Helwig <jacob@puppetlabs.com>2011-08-19 13:52:57 -0700
commit881c3858e88b6cc3d2c0e7bea6785fcbf091e4c0 (patch)
treed7ce1350905aa2904ee001666834a5fd8f7134d2
parent9c575bd9106b3ffed92c357ead8ff06c01c484d5 (diff)
downloadpuppet-881c3858e88b6cc3d2c0e7bea6785fcbf091e4c0.tar.gz
puppet-881c3858e88b6cc3d2c0e7bea6785fcbf091e4c0.tar.xz
puppet-881c3858e88b6cc3d2c0e7bea6785fcbf091e4c0.zip
(#8272) Use symbols instead of booleans for enabled property on Windows
Because the enable property of the service type uses :true and :false as its valid values, rather than true and false, we need to return :true and :false from our enabled? method. Otherwise, the property was being synced every time it was enabled or disabled, regardless of whether it was actually in sync or not. Reviewed-By: Jacob Helwig <jacob@puppetlabs.com> (cherry picked from commit 44e2d494f499e2005c1b31b92b97834189d4224d)
-rw-r--r--lib/puppet/provider/service/windows.rb4
-rwxr-xr-xspec/unit/provider/service/windows_spec.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/puppet/provider/service/windows.rb b/lib/puppet/provider/service/windows.rb
index 56d56b0a9..d77f3b44a 100644
--- a/lib/puppet/provider/service/windows.rb
+++ b/lib/puppet/provider/service/windows.rb
@@ -46,11 +46,11 @@ Puppet::Type.type(:service).provide :windows do
when Win32::Service.get_start_type(Win32::Service::SERVICE_AUTO_START),
Win32::Service.get_start_type(Win32::Service::SERVICE_BOOT_START),
Win32::Service.get_start_type(Win32::Service::SERVICE_SYSTEM_START)
- true
+ :true
when Win32::Service.get_start_type(Win32::Service::SERVICE_DEMAND_START)
:manual
when Win32::Service.get_start_type(Win32::Service::SERVICE_DISABLED)
- false
+ :false
else
raise Puppet::Error.new("Unknown start type: #{w32ss.start_type}")
end
diff --git a/spec/unit/provider/service/windows_spec.rb b/spec/unit/provider/service/windows_spec.rb
index be2f33c20..fff875032 100755
--- a/spec/unit/provider/service/windows_spec.rb
+++ b/spec/unit/provider/service/windows_spec.rb
@@ -105,7 +105,7 @@ describe provider_class, :if => Puppet.features.microsoft_windows? do
)
)
resource = Puppet::Type.type(:service).new(:name => 'snmptrap')
- resource.provider.enabled?.should == false
+ resource.provider.enabled?.should == :false
end
# We need to guard this section explicitly since rspec will always
@@ -122,7 +122,7 @@ describe provider_class, :if => Puppet.features.microsoft_windows? do
)
)
resource = Puppet::Type.type(:service).new(:name => 'snmptrap')
- resource.provider.enabled?.should == true
+ resource.provider.enabled?.should == :true
end
end
end