diff options
| author | Carl Lerche <me@carllerche.com> | 2010-10-13 12:32:52 -0700 |
|---|---|---|
| committer | Carl Lerche <me@carllerche.com> | 2010-10-13 12:32:52 -0700 |
| commit | 91ba75806f20195b06b9a2197cf5f40a238231d5 (patch) | |
| tree | a21ce01948f4448c7ed1c4fd05944c0a9914a3a5 | |
| parent | 0b6af35ef0647cf346bc7e274fc49da64f790ab0 (diff) | |
| download | rails-91ba75806f20195b06b9a2197cf5f40a238231d5.tar.gz rails-91ba75806f20195b06b9a2197cf5f40a238231d5.tar.bz2 rails-91ba75806f20195b06b9a2197cf5f40a238231d5.zip | |
Update the ActiveRecord tests to not set unused options
This makes a test fail, but it is revealing a bug in Arel master.
| -rw-r--r-- | activerecord/lib/active_record/test_case.rb | 15 | ||||
| -rw-r--r-- | activerecord/test/cases/locking_test.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/transactions_test.rb | 2 |
3 files changed, 0 insertions, 19 deletions
diff --git a/activerecord/lib/active_record/test_case.rb b/activerecord/lib/active_record/test_case.rb index 31b5a8651b..014a900c71 100644 --- a/activerecord/lib/active_record/test_case.rb +++ b/activerecord/lib/active_record/test_case.rb @@ -36,21 +36,6 @@ module ActiveRecord assert_queries(0, &block) end - def self.use_concurrent_connections - setup :connection_allow_concurrency_setup - teardown :connection_allow_concurrency_teardown - end - - def connection_allow_concurrency_setup - @connection = ActiveRecord::Base.remove_connection - ActiveRecord::Base.establish_connection(@connection.merge({:allow_concurrency => true})) - end - - def connection_allow_concurrency_teardown - ActiveRecord::Base.clear_all_connections! - ActiveRecord::Base.establish_connection(@connection) - end - def with_kcode(kcode) if RUBY_VERSION < '1.9' orig_kcode, $KCODE = $KCODE, kcode diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb index e7126964cd..48719c660d 100644 --- a/activerecord/test/cases/locking_test.rb +++ b/activerecord/test/cases/locking_test.rb @@ -306,8 +306,6 @@ unless current_adapter?(:SybaseAdapter, :OpenBaseAdapter) end if current_adapter?(:PostgreSQLAdapter, :OracleAdapter) - use_concurrent_connections - def test_no_locks_no_wait first, second = duel { Person.find 1 } assert first.end > second.end diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb index 9255190613..8385286fd0 100644 --- a/activerecord/test/cases/transactions_test.rb +++ b/activerecord/test/cases/transactions_test.rb @@ -529,8 +529,6 @@ end if Topic.connection.supports_savepoints? if current_adapter?(:PostgreSQLAdapter) class ConcurrentTransactionTest < TransactionTest - use_concurrent_connections - # This will cause transactions to overlap and fail unless they are performed on # separate database connections. def test_transaction_per_thread |