aboutsummaryrefslogtreecommitdiffstats
path: root/test/utils.rb
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2016-09-06 07:21:14 +0900
committerKazuki Yamaguchi <k@rhe.jp>2016-09-07 08:56:28 +0900
commit6c864ac01fee46180c594ad68f199546c5eef5ee (patch)
treea25deef05ecd7fbdefb5f6db9f4b1ba5f4f562d2 /test/utils.rb
parentc6b0bc0e3a2ca82c6e8fb1d3a7f29764b654ca23 (diff)
downloadruby-openssl-6c864ac01fee46180c594ad68f199546c5eef5ee.tar.gz
test/test_ssl: remove 'STARTTLS' code from test/utils.rb
Move it to TestSSL#test_starttls using the server_proc option of start_server, as it is the only user of the 'STARTTLS' code.
Diffstat (limited to 'test/utils.rb')
-rw-r--r--test/utils.rb11
1 files changed, 0 insertions, 11 deletions
diff --git a/test/utils.rb b/test/utils.rb
index 4d055032..45ea8766 100644
--- a/test/utils.rb
+++ b/test/utils.rb
@@ -241,10 +241,6 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
def readwrite_loop(ctx, ssl)
while line = ssl.gets
- if line =~ /^STARTTLS$/
- ssl.accept
- next
- end
ssl.write(line)
end
rescue OpenSSL::SSL::SSLError
@@ -336,13 +332,6 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
end
}
end
-
- def starttls(ssl)
- ssl.puts("STARTTLS")
- sleep 1 # When this line is eliminated, process on Cygwin blocks
- # forever at ssl.connect. But I don't know why it does.
- ssl.connect
- end
end
class OpenSSL::PKeyTestCase < OpenSSL::TestCase