Fixing failing tests, including making the debian service

provider test work on non-Debian platforms.

2 files changed, 5 insertions, 19 deletions

diff --git a/test/rails/host.rb b/test/rails/host.rb
index 4d9c64932..0d97e0ffa 100755
--- a/test/rails/host.rb
+++ b/test/rails/host.rb
@@ -155,10 +155,9 @@ class TestRailsHost < PuppetTest::TestCase
         Puppet::Rails.init
         Puppet[:storeconfigs] = true
 
+        Puppet[:code] = " "
         # this is the default server setup
         master = Puppet::Network::Handler.configuration.new(
-            :Code => "",
-            :UseNodes => true,
             :Local => true
         )
 
diff --git a/test/ral/providers/service/debian.rb b/test/ral/providers/service/debian.rb
index f74141f9e..ed90f8fef 100755
--- a/test/ral/providers/service/debian.rb
+++ b/test/ral/providers/service/debian.rb
@@ -12,22 +12,11 @@ class TestDebianServiceProvider < Test::Unit::TestCase
     include Puppet::Util
 
     def prepare_provider(servicename, output)
-        service = Puppet::Type.type(:service).create(
-                                                     :name => servicename, :provider => :debian
-                                                     )
+        @resource = mock 'resource'
+        @resource.stubs(:[]).with(:name).returns("myresource")
+        provider = Puppet::Type.type(:service).provider(:debian).new(@resource)
 
-        provider = service.provider
-        assert(provider, "did not get debian provider")
-
-        metaclass = class << provider
-                        self
-                    end
-
-        metaclass.instance_eval do
-            define_method :update do |*args|
-                return output
-            end
-        end
+        provider.stubs(:update).returns(output)
 
         provider
     end
@@ -67,5 +56,3 @@ class TestDebianServiceProvider < Test::Unit::TestCase
         assert_disabled("test4", " Removing any system startup links for /etc/init.d/test4 ...\n")
     end
 end
-
-# $Id$