Permalink
Browse files

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
  • Loading branch information...
1 parent 6c271a9 commit 079d684a37a1d5e7c61661bdf6221ded90c06159 @jeremy jeremy committed Nov 15, 2006
Showing with 3 additions and 3 deletions.
  1. +3 −3 actionpack/test/active_record_unit.rb
@@ -57,7 +57,7 @@ def setup_connection
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 @@ def self.fixtures(*args)
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

0 comments on commit 079d684

Please sign in to comment.