From a66f05d2ddb33eaef49381bb3f7a9c46262da677 Mon Sep 17 00:00:00 2001 From: rusher Date: Tue, 15 Oct 2024 21:41:35 +0200 Subject: [PATCH] [misc] test correction for ES server --- src/test/java/org/mariadb/jdbc/integration/SslTest.java | 4 +--- src/test/java/org/mariadb/jdbc/integration/XaTest.java | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/mariadb/jdbc/integration/SslTest.java b/src/test/java/org/mariadb/jdbc/integration/SslTest.java index 553b39da0..a5e5259d3 100644 --- a/src/test/java/org/mariadb/jdbc/integration/SslTest.java +++ b/src/test/java/org/mariadb/jdbc/integration/SslTest.java @@ -140,9 +140,7 @@ private String getSslVersion(Connection con) throws SQLException { @Test public void simpleSsl() throws SQLException { - try (Connection con = - createCon( - "sslMode=trust&enabledSslCipherSuites=TLS_DHE_RSA_WITH_AES_256_GCM_SHA384", sslPort)) { + try (Connection con = createCon("sslMode=trust", sslPort)) { assertNotNull(getSslVersion(con)); } try (Connection con = createCon("sslMode=trust&useReadAheadInput=false", sslPort)) { diff --git a/src/test/java/org/mariadb/jdbc/integration/XaTest.java b/src/test/java/org/mariadb/jdbc/integration/XaTest.java index 970076a50..f53e2da97 100644 --- a/src/test/java/org/mariadb/jdbc/integration/XaTest.java +++ b/src/test/java/org/mariadb/jdbc/integration/XaTest.java @@ -388,7 +388,9 @@ public void errorCodeTest() throws SQLException, XAException { xaResource.commit(xid, true); fail(); } catch (XAException xae) { - assertEquals(XAException.XAER_INVAL, xae.errorCode); // 1398 + assertTrue( + XAException.XAER_INVAL == xae.errorCode + || XAException.XAER_NOTA == xae.errorCode); // 1398 } try { xaResource.commit(xid, true);