aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-11-15 12:43:34 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-11-15 12:43:34 +0000
commit079d684a37a1d5e7c61661bdf6221ded90c06159 (patch)
tree098e3c40a85db065dfaa315605fe355e63109288
parent6c271a98dc3004e43bc6aaf7db6fe7c044b0bb3d (diff)
downloadrails-079d684a37a1d5e7c61661bdf6221ded90c06159.tar.gz
rails-079d684a37a1d5e7c61661bdf6221ded90c06159.tar.bz2
rails-079d684a37a1d5e7c61661bdf6221ded90c06159.zip
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
-rw-r--r--actionpack/test/active_record_unit.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/active_record_unit.rb b/actionpack/test/active_record_unit.rb
index 02cf3f707d..bcca8822d8 100644
--- a/actionpack/test/active_record_unit.rb
+++ b/actionpack/test/active_record_unit.rb
@@ -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