diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-10-17 17:56:49 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-10-17 17:56:49 +0000 |
commit | 69f86f79e25d7e0bd56f9967d2f3905a9cd4a26e (patch) | |
tree | 10840b1bb666064351b91771ce114b6b7800cf33 | |
parent | 10555f93fb7c9db39964122b8f6679897eb9655a (diff) |
merge revision(s) 53520: [Backport #12776]
test_thread.rb: wait for the thread to sleep
* test/ruby/test_thread.rb (test_thread_name): wait for the status
of the subject thread to fix, so that the status does not change
between two inspect methods.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@56440 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/ruby/test_thread.rb | 1 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index c90c369bb7..6ad33b83d4 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -1052,6 +1052,7 @@ q.pop def test_thread_name t = Thread.start {sleep} + sleep 0.001 until t.stop? assert_nil t.name s = t.inspect t.name = 'foo' @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.2" #define RUBY_RELEASE_DATE "2016-10-18" -#define RUBY_PATCHLEVEL 198 +#define RUBY_PATCHLEVEL 199 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 10 |