Permalink
Browse files

Update the ActiveRecord tests to not set unused options

	This makes a test fail, but it is revealing a bug in Arel master.
  • Loading branch information...
1 parent 0b6af35 commit 91ba75806f20195b06b9a2197cf5f40a238231d5 @carllerche carllerche committed Oct 13, 2010
@@ -36,21 +36,6 @@ def assert_no_queries(&block)
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
@@ -306,8 +306,6 @@ def test_sane_lock_method
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
@@ -529,8 +529,6 @@ def test_no_automatic_savepoint_for_inner_transaction
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

0 comments on commit 91ba758

Please sign in to comment.