Skip to content

Commit cc70738

Browse files
committed
[test] remove (old) skips/excludes on Java 6
1 parent 3ca7282 commit cc70738

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

src/test/ruby/ssl/test_context.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@ def test_context_set_ssl_version
106106
end
107107

108108
def test_context_ciphers
109-
return skip('on Java 6') if defined?(ENV_JAVA) && ENV_JAVA['java.version'] < '1.7'
110-
111109
self.class.disable_security_restrictions
112110

113111
context = OpenSSL::SSL::SSLContext.new
@@ -224,6 +222,6 @@ def test_context_ciphers
224222

225223
diff = (expected_ciphers - all_ciphers).compact
226224
assert_equal [], diff
225+
end
227226

228-
end if RUBY_VERSION > '1.9'
229227
end

src/test/ruby/ssl/test_ssl.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def test_ssl_version_tlsv1_1
122122
assert_equal("TLSv1.1", ssl.ssl_version)
123123
ssl.close
124124
end
125-
end unless java6? # TLS1_1 is not supported by JDK 6
125+
end
126126

127127
def test_ssl_version_tlsv1_2
128128
ctx_proc = Proc.new do |ctx|
@@ -135,7 +135,7 @@ def test_ssl_version_tlsv1_2
135135
assert_equal("TLSv1.2", ssl.ssl_version)
136136
ssl.close
137137
end
138-
end unless java6? # TLS1_2 is not supported by JDK 6
138+
end
139139

140140
def test_read_nonblock_would_block
141141
start_server0(PORT, OpenSSL::SSL::VERIFY_NONE, true) do |server, port|
@@ -167,7 +167,7 @@ def test_read_nonblock_would_block
167167

168168
ssl.close
169169
end
170-
end if RUBY_VERSION > '1.9'
170+
end
171171

172172
def test_connect_nonblock_would_block
173173
start_server0(PORT, OpenSSL::SSL::VERIFY_NONE, true) do |server, port|
@@ -199,7 +199,7 @@ def test_connect_nonblock_would_block
199199

200200
ssl.close
201201
end
202-
end if RUBY_VERSION > '1.9'
202+
end
203203

204204
def test_renegotiation_cb
205205
num_handshakes = 0

0 commit comments

Comments
 (0)