diff options
| author | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-05 11:44:30 +0000 |
|---|---|---|
| committer | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-05 11:44:30 +0000 |
| commit | fab171e541f7b7373efe386ae956d7a44ce4e330 (patch) | |
| tree | 4c78cab8639d6cea73b318ebb4466860b2158017 | |
| parent | 37ab3ed99d47a00f28253ea336d127efefd80ac6 (diff) | |
* test/ruby/test_thread.rb: fix potential race condition.
The thread could have a "sleep" status because it tries
to acquire the mutex, but does not have it yet.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52041 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/ruby/test_thread.rb | 5 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Mon Oct 5 20:39:32 2015 Benoit Daloze <eregontp@gmail.com> + + * test/ruby/test_thread.rb: fix potential race condition. + The thread could have a "sleep" status because it tries + to acquire the mutex, but does not have it yet. + Mon Oct 5 15:39:30 2015 Zachary Scott <zzak@ruby-lang.org> * numeric.c: [DOC] Overview for Numeric class by Joe Corcoran diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index eaf65ae86d..e60da4f120 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -914,9 +914,8 @@ q.pop sleep } - Thread.pass until th.status == "sleep" - # acquired another thread. - assert_equal(mutex.locked?, true) + # acquired by another thread. + Thread.pass until mutex.locked? assert_equal(mutex.owned?, false) ensure th.kill if th |