diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-31 14:05:54 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-31 14:05:54 +0000 |
commit | f07096f7e19a425a68101dc5fd79bc58e3f42f67 (patch) | |
tree | 02928416ce350c4f42736ab777a7109510f55ff3 /test/open-uri/test_ssl.rb | |
parent | 6c6f9b19b4bc6256b4605b35f25fd9b4b530e0ba (diff) |
Join threads.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/open-uri/test_ssl.rb')
-rw-r--r-- | test/open-uri/test_ssl.rb | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/test/open-uri/test_ssl.rb b/test/open-uri/test_ssl.rb index f3e1f48de7..4978f93030 100644 --- a/test/open-uri/test_ssl.rb +++ b/test/open-uri/test_ssl.rb @@ -31,13 +31,11 @@ class TestOpenURISSL :Port => 0}) _, port, _, host = srv.listeners[0].addr begin - srv.start + th = srv.start yield srv, dr, "https://#{host}:#{port}" ensure srv.shutdown - until srv.status == :Stop - sleep 0.1 - end + th.join end } end @@ -85,7 +83,7 @@ class TestOpenURISSL :Port => 0}) _, p_port, _, p_host = prxy.listeners[0].addr begin - prxy.start + th = prxy.start srv.mount_proc("/proxy", lambda { |req, res| res.body = "proxy" } ) open("#{url}/proxy", :proxy=>"http://#{p_host}:#{p_port}/", :ssl_ca_cert => cacert_filename) {|f| assert_equal("200", f.status[0]) @@ -101,9 +99,7 @@ class TestOpenURISSL sio.truncate(0); sio.rewind ensure prxy.shutdown - until prxy.status == :Stop - sleep 0.1 - end + th.join end } end |