Fixing some warnings

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1853 980ebf18-57e1-0310-9a29-db15c13687c0

6 files changed, 21 insertions, 17 deletions

diff --git a/lib/puppet/metatype/manager.rb b/lib/puppet/metatype/manager.rb
index 0eee2213d..996d9a3cc 100644
--- a/lib/puppet/metatype/manager.rb
+++ b/lib/puppet/metatype/manager.rb
@@ -139,14 +139,6 @@ module Manager
 
         @typeloader
     end
-
-    # remove all type instances; this is mostly only useful for testing
-    def allclear
-        Puppet::Event::Subscription.clear
-        @types.each { |name, type|
-            type.clear
-        }
-    end
 end
 end
 
diff --git a/lib/puppet/provider/mount/parsed.rb b/lib/puppet/provider/mount/parsed.rb
index 5e9a6cf1d..3db4d7ac2 100755
--- a/lib/puppet/provider/mount/parsed.rb
+++ b/lib/puppet/provider/mount/parsed.rb
@@ -3,7 +3,7 @@ require 'puppet/provider/parsedfile'
 Puppet::Type.type(:mount).provide :parsed, :parent => Puppet::Provider::ParsedFile do
     @filetype = Puppet::FileType.filetype(:flat)
 
-    commands :mount => "mount", :umount => "umount", :df => "df"
+    commands :mountcmd => "mount", :umount => "umount", :df => "df"
 
     def self.init
         @platform = Facter["operatingsystem"].value
@@ -135,11 +135,7 @@ Puppet::Type.type(:mount).provide :parsed, :parent => Puppet::Provider::ParsedFi
 
     # This only works when the mount point is synced to the fstab.
     def mount
-        output = %x{#{command(:mount)} #{@model[:path]} 2>&1}
-
-        unless $? == 0
-            raise Puppet::Error, "Could not mount %s: %s" % [@model[:path], output]
-        end
+        mountcmd @model[:path]
     end
 
     # This only works when the mount point is synced to the fstab.
diff --git a/lib/puppet/provider/package/apt.rb b/lib/puppet/provider/package/apt.rb
index a53490d04..511687338 100755
--- a/lib/puppet/provider/package/apt.rb
+++ b/lib/puppet/provider/package/apt.rb
@@ -45,7 +45,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg do
     # installing a specific version.
     def install
         if @model[:responsefile]
-            self.preseed
+            self.run_preseed
         end
         should = @model.should(:ensure)
 
@@ -108,7 +108,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg do
 	#
 	# preseeds answers to dpkg-set-selection from the "responsefile"
 	#
-    def preseed
+    def run_preseed
         if response = @model[:responsefile] && FileTest.exists?(response)
             self.info("Preseeding %s to debconf-set-selections" % response)
 
diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb
index 42baee8bb..ce1e3ebe9 100644
--- a/lib/puppet/rails.rb
+++ b/lib/puppet/rails.rb
@@ -72,6 +72,9 @@ require 'puppet/rails/database/schema_init'
         unless defined? ActiveRecord::Base
             raise Puppet::DevError, "No activerecord, cannot init Puppet::Rails"
         end
+        
+        
+        ActiveRecord::Base.logger = Logger.new(Puppet[:railslog])
 
         # This global init does not work for testing, because we remove
         # the state dir on every test.
diff --git a/lib/puppet/type/parsedtype.rb b/lib/puppet/type/parsedtype.rb
index a74ba02ac..4297946a9 100755
--- a/lib/puppet/type/parsedtype.rb
+++ b/lib/puppet/type/parsedtype.rb
@@ -130,7 +130,10 @@ module Puppet
         end
 
         def self.list
-            retrieve.collect { |i| i.is_a? Hash }.collect { |i| hash2obj(i) }
+            suitableprovider.collect do |provider|
+                puts provider.name
+                provider.retrieve.collect { |i| p i; i.is_a? Hash }.collect { |i| hash2obj(i) }
+            end.flatten
         end
 
         def self.listbyname
diff --git a/test/types/mount.rb b/test/types/mount.rb
index aab80506d..2b69e73dd 100755
--- a/test/types/mount.rb
+++ b/test/types/mount.rb
@@ -105,6 +105,7 @@ class TestMounts < Test::Unit::TestCase
         mount = mkmount
 
         assert_apply(mount)
+        assert_events([], mount)
 
         assert_nothing_raised { mount.retrieve }
 
@@ -148,6 +149,15 @@ class TestMounts < Test::Unit::TestCase
         obj.retrieve
         assert(obj.provider.mounted?, "Object is not mounted")
     end
+    
+    def test_list
+        list = nil
+        assert_nothing_raised do
+            list = Puppet::Type.type(:mount).list
+        end
+        
+        assert(list.length > 0, "Did not return any mounts")
+    end
 end
 
 # $Id$