Skip to content

Commit

Permalink
[misc] ensure testing java lts version
Browse files Browse the repository at this point in the history
  • Loading branch information
diego Dupin committed Jan 21, 2022
1 parent 2f45584 commit cfc37b0
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 7 deletions.
20 changes: 13 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cache:
- $HOME/docker
- $HOME/.m2

env: LOCAL=0
env: local=0

install:
- |-
Expand All @@ -38,24 +38,30 @@ jobs:
allow_failures:
- env: srv=build v=10.6
include:
- env: srv=mariadb v=10.5
- env: srv=mariadb v=10.6
os: windows
language: shell
- env: srv=mariadb v=10.2 local=1
- env: srv=mariadb v=10.3 local=1
- env: srv=mariadb v=10.4 local=1
- env: srv=mariadb v=10.6 local=1
- env: srv=mariadb v=10.5 packet=40
- env: srv=mariadb v=10.5 packet=8
- env: srv=mariadb v=10.5 BENCH=1
- env: srv=mariadb v=10.5 local=1
- env: srv=mariadb v=10.7 local=1
- env: srv=mariadb v=10.6 packet=40
jdk: openjdk8
- env: srv=mariadb v=10.6 packet=40
jdk: openjdk17
- env: srv=mariadb v=10.6 packet=8
- env: srv=mariadb v=10.6 local=1 BENCH=1
- if: type = push AND fork = false
env: srv=maxscale
- if: type = push AND fork = false
env: srv=build v=10.6
- if: type = push AND fork = false
env: srv=mariadb-es v=10.6
- if: type = push AND fork = false
env: srv=mysql v=5.7
- if: type = push AND fork = false
env: srv=mysql v=8.0 TEST_DB_OTHER=allowPublicKeyRetrieval
env: srv=mysql v=8.0
- if: type = push AND fork = false
env: srv=skysql
- if: type = push AND fork = false
Expand Down
9 changes: 9 additions & 0 deletions src/test/java/org/mariadb/jdbc/SslTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,14 @@

import java.io.*;
import java.nio.file.Paths;
import java.security.NoSuchAlgorithmException;
import java.sql.*;
import java.util.*;
import org.junit.*;
import org.mariadb.jdbc.failover.TcpProxy;

import javax.net.ssl.SSLContext;

@SuppressWarnings("ResultOfMethodCallIgnored")
public class SslTest extends BaseTest {

Expand Down Expand Up @@ -163,6 +166,12 @@ public void mandatorySsl() throws SQLException {

@Test
public void enabledSslProtocolSuites() throws SQLException {
try {
List<String> protocols = Arrays.asList(SSLContext.getDefault().getSupportedSSLParameters().getProtocols());
Assume.assumeTrue(protocols.contains("TLSv1.3") && protocols.contains("TLSv1.2"));
} catch (NoSuchAlgorithmException e) {
// eat
}
Assume.assumeTrue(
!"maxscale".equals(System.getenv("srv")) && !"skysql-ha".equals(System.getenv("srv")));
try (Connection con =
Expand Down

0 comments on commit cfc37b0

Please sign in to comment.