Fix failing test fallback when neither SQLite 2 or 3 is available.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5524 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper
2006-11-15 12:43:34 +00:00
parent 6c271a98dc
commit 079d684a37

View File

@@ -57,7 +57,7 @@ class ActiveRecordTestConnector
ActiveRecord::Base.configurations = { 'sqlite3_ar_integration' => connection_options }
ActiveRecord::Base.connection
rescue Exception # errors from establishing a connection
$stderr.puts 'SQLite 3 unavailable; falling to SQLite 2.'
$stderr.puts 'SQLite 3 unavailable; trying SQLite 2.'
connection_options = {:adapter => 'sqlite', :dbfile => ':memory:'}
ActiveRecord::Base.establish_connection(connection_options)
ActiveRecord::Base.configurations = { 'sqlite2_ar_integration' => connection_options }
@@ -95,8 +95,8 @@ class ActiveRecordTestCase < Test::Unit::TestCase
super if ActiveRecordTestConnector.connected
end
def setup
abort_tests unless ActiveRecordTestConnector.connected
def run(*args)
super if ActiveRecordTestConnector.connected
end
# Default so Test::Unit::TestCase doesn't complain