aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-08-08 16:05:26 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-08-08 16:05:26 -0700
commitb8903f3606c52b16f248679b086c4f2cf9970692 (patch)
tree45a9ae9ba7b08c3147bd5f0af4a1e96bdb6a005f
parentec923abe56c2ca08b9d1d767628091b67d66e6e5 (diff)
parent1e17a9d367c54c680368be72f44247ae28b98904 (diff)
downloadrails-b8903f3606c52b16f248679b086c4f2cf9970692.tar.gz
rails-b8903f3606c52b16f248679b086c4f2cf9970692.tar.bz2
rails-b8903f3606c52b16f248679b086c4f2cf9970692.zip
Merge pull request #7294 from stevecj/fix-psql-reconnect-after-simulated-disconnect-test
Fix only-once stub logic.
-rw-r--r--activerecord/test/cases/adapters/postgresql/connection_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/connection_test.rb b/activerecord/test/cases/adapters/postgresql/connection_test.rb
index 47089d5d0d..1ff307c735 100644
--- a/activerecord/test/cases/adapters/postgresql/connection_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/connection_test.rb
@@ -92,9 +92,9 @@ module ActiveRecord
def query_fake(*args)
if !( @called ||= false )
self.stubs(:status).returns(PGconn::CONNECTION_BAD)
+ @called = true
raise PGError
else
- @called = true
self.unstub(:status)
query_unfake(*args)
end