diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2015-11-18 18:07:32 -0200 |
---|---|---|
committer | Rafael França <rafaelmfranca@gmail.com> | 2015-11-18 18:07:32 -0200 |
commit | 3d8a7c0e64fef726c22fd64911771cee8c467447 (patch) | |
tree | e637babeba9aed53a622b8877a521b4a88312eb1 /activerecord/test/cases/adapters/mysql/connection_test.rb | |
parent | a951d5b0933a4a043619bc1bccb561d499b04633 (diff) | |
parent | 5ce21d4f72e72f8acdd5b849425a9475733d4d11 (diff) | |
download | rails-3d8a7c0e64fef726c22fd64911771cee8c467447.tar.gz rails-3d8a7c0e64fef726c22fd64911771cee8c467447.tar.bz2 rails-3d8a7c0e64fef726c22fd64911771cee8c467447.zip |
Merge pull request #22330 from samphilipd/samphilipd/rename_advisory_lock_key
Rename 'key' to 'lock_id' or 'lock_name' for advisory locking
Diffstat (limited to 'activerecord/test/cases/adapters/mysql/connection_test.rb')
-rw-r--r-- | activerecord/test/cases/adapters/mysql/connection_test.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/activerecord/test/cases/adapters/mysql/connection_test.rb b/activerecord/test/cases/adapters/mysql/connection_test.rb index 75653ee9af..390dd15b92 100644 --- a/activerecord/test/cases/adapters/mysql/connection_test.rb +++ b/activerecord/test/cases/adapters/mysql/connection_test.rb @@ -171,31 +171,31 @@ class MysqlConnectionTest < ActiveRecord::MysqlTestCase end def test_get_and_release_advisory_lock - key = "test_key" + lock_name = "test_lock_name" - got_lock = @connection.get_advisory_lock(key) + got_lock = @connection.get_advisory_lock(lock_name) assert got_lock, "get_advisory_lock should have returned true but it didn't" - assert_equal test_lock_free(key), false, + assert_equal test_lock_free(lock_name), false, "expected the test advisory lock to be held but it wasn't" - released_lock = @connection.release_advisory_lock(key) + released_lock = @connection.release_advisory_lock(lock_name) assert released_lock, "expected release_advisory_lock to return true but it didn't" - assert test_lock_free(key), 'expected the test key to be available after releasing' + assert test_lock_free(lock_name), 'expected the test lock to be available after releasing' end def test_release_non_existent_advisory_lock - fake_key = "fake_key" - released_non_existent_lock = @connection.release_advisory_lock(fake_key) + lock_name = "fake_lock_name" + released_non_existent_lock = @connection.release_advisory_lock(lock_name) assert_equal released_non_existent_lock, false, 'expected release_advisory_lock to return false when there was no lock to release' end protected - def test_lock_free(key) - @connection.select_value("SELECT IS_FREE_LOCK('#{key}');") == '1' + def test_lock_free(lock_name) + @connection.select_value("SELECT IS_FREE_LOCK('#{lock_name}');") == '1' end private |