diff --git a/src/test/ruby/ssl/test_context.rb b/src/test/ruby/ssl/test_context.rb index 42af723f..9d6158d5 100644 --- a/src/test/ruby/ssl/test_context.rb +++ b/src/test/ruby/ssl/test_context.rb @@ -176,6 +176,6 @@ def test_context_ciphers diff = (expected_ciphers - all_ciphers).compact assert_equal [], diff - end + end unless java7? # would need to filter out stuff such as ECDHE-RSA-AES128-GCM-SHA256 end diff --git a/src/test/ruby/test_helper.rb b/src/test/ruby/test_helper.rb index f23c2d7f..6872b193 100644 --- a/src/test/ruby/test_helper.rb +++ b/src/test/ruby/test_helper.rb @@ -127,7 +127,6 @@ def self.security_restrictions? disable_security_restrictions; return @@security_restrictions end - def self.java6?; java_version.last.to_i == 6 end def self.java7?; java_version.last.to_i == 7 end def self.java8?; java_version.last.to_i == 8 end