Fixing #527 (rewrote service tests), #766 (services only restart when they

are running), and #918 (service tests fail when hddtemp is not installed).

Mostly, I just rewrote the service tests, but I cleaned up the cruft from the
Service class, too.

2 files changed, 0 insertions, 12 deletions

diff --git a/lib/puppet/provider/service/init.rb b/lib/puppet/provider/service/init.rb
index c3328f517..3b568d5a1 100755
--- a/lib/puppet/provider/service/init.rb
+++ b/lib/puppet/provider/service/init.rb
@@ -20,14 +20,6 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     # We can't confine this here, because the init path can be overridden.
     #confine :exists => @defpath
 
-    if self.suitable?
-        # Add it to the search paths
-        Puppet.type(:service).newpath(:init, defpath())
-
-        # Set the default init directory.
-        Puppet.type(:service).attrclass(:path).defaultto defpath()
-    end
-
     # List all services of this type.
     def self.instances(name)
         # We need to find all paths specified for our type or any parent types
diff --git a/lib/puppet/provider/service/redhat.rb b/lib/puppet/provider/service/redhat.rb
index 41a060ee4..b013c34dc 100755
--- a/lib/puppet/provider/service/redhat.rb
+++ b/lib/puppet/provider/service/redhat.rb
@@ -12,10 +12,6 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do
         superclass.defpath
     end
 
-    if self.suitable?
-        Puppet.type(:service).newpath(:redhat, defpath())
-    end
-
     # Remove the symlinks
     def disable
         begin