Some rails modifications

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

2 files changed, 14 insertions, 7 deletions

diff --git a/test/lib/puppettest/railstesting.rb b/test/lib/puppettest/railstesting.rb
index 3b65f5b34..baac6e03a 100644
--- a/test/lib/puppettest/railstesting.rb
+++ b/test/lib/puppettest/railstesting.rb
@@ -8,7 +8,9 @@ module PuppetTest::RailsTesting
     end
 
     def railsteardown
-        Puppet::Rails.teardown
+        if Puppet[:dbadapter] != "sqlite3"
+            Puppet::Rails.teardown
+        end
     end
 
     def railsresource(type = "file", title = "/tmp/testing", params = {})
diff --git a/test/rails/rails.rb b/test/rails/rails.rb
index 381150be3..05fad4c87 100755
--- a/test/rails/rails.rb
+++ b/test/rails/rails.rb
@@ -24,7 +24,17 @@ class TestRails < Test::Unit::TestCase
     end
 
     # Don't do any tests w/out this class
-    if defined? ActiveRecord::Base
+    if Puppet.features.rails?
+    def setup
+        super
+        railsinit
+    end
+
+    def teardown
+        super
+        railsteardown
+    end
+
     def test_hostcache
 	railsinit
         @interp, @scope, @source = mkclassframing
@@ -38,11 +48,6 @@ class TestRails < Test::Unit::TestCase
         # Now collect our facts
         facts = Facter.to_hash
 
-        assert_nothing_raised {
-            Puppet::Rails.teardown
-            Puppet::Rails.init
-        }
-
         # Now try storing our crap
         host = nil
         assert_nothing_raised {