Skip to content

Commit 3a29867

Browse files
committed
[test] skip tls cipher check on java 7
1 parent ccb6272 commit 3a29867

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

src/test/ruby/ssl/test_context.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,6 @@ def test_context_ciphers
176176

177177
diff = (expected_ciphers - all_ciphers).compact
178178
assert_equal [], diff
179-
end
179+
end unless java7? # would need to filter out stuff such as ECDHE-RSA-AES128-GCM-SHA256
180180

181181
end

src/test/ruby/test_helper.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ def self.security_restrictions?
127127
disable_security_restrictions; return @@security_restrictions
128128
end
129129

130-
def self.java6?; java_version.last.to_i == 6 end
131130
def self.java7?; java_version.last.to_i == 7 end
132131
def self.java8?; java_version.last.to_i == 8 end
133132

src/test/ruby/x509/test_x509cert.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def test_resolve_extensions
133133

134134
# Java 6/7 seems to maintain same order but Java 8 does definitely not :
135135
# TODO there must be something going on under - maybe not BC parsing ?!?
136-
if self.class.java6? || self.class.java7?
136+
if self.class.java7?
137137
assert_equal '97:39:9D:C3:FB:CD:BA:8F:54:0C:90:7B:46:3F:EA:D6:43:75:B1:CB', cert.extensions[2].value
138138
assert_equal 'email:self@jruby.org, DNS:jruby.org', cert.extensions[4].value
139139
end

0 commit comments

Comments
 (0)