From 359b08736d4cb1cfbba9874f8f76738be0b4be77 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Fri, 19 Jun 2026 13:15:05 +0200 Subject: [PATCH 1/2] HDDS-15621. TestSecureOzoneCluster fails locally --- .../java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java index 3379167c1ca..f2fead2a75c 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java @@ -1352,12 +1352,9 @@ void validateCertificate(X509Certificate cert) throws Exception { if (m.matches()) { cn = m.group(1); } - String hostName = InetAddress.getLocalHost().getHostName(); - // Subject name should be om login user in real world but in this test // UGI has scm user context. - assertThat(cn).contains(SCM_SUB_CA); - assertThat(cn).contains(hostName); + assertThat(cn).isEqualTo(SCM_SUB_CA + "@localhost"); LocalDate today = ZonedDateTime.now().toLocalDate(); Date invalidDate; From 665d9516c317277c1ee0fbb5a5fd1deee2942736 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Fri, 19 Jun 2026 13:26:24 +0200 Subject: [PATCH 2/2] improve assertTrue --- .../hadoop/ozone/TestSecureOzoneCluster.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java index f2fead2a75c..386ba7c8240 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java @@ -63,7 +63,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.mock; @@ -541,9 +540,9 @@ void testSecureOMDelegationTokenSecretManagerInitializationFailure() throws Exce conf.setTimeDuration(OMConfigKeys.DELEGATION_TOKEN_MAX_LIFETIME_KEY, 7, TimeUnit.DAYS); IllegalArgumentException exception = assertThrows( IllegalArgumentException.class, () -> setupOm(conf)); - assertTrue(exception.getMessage().contains("Secret key expiry duration hdds.secret.key.expiry.duration " + + assertThat(exception.getMessage()).contains("Secret key expiry duration hdds.secret.key.expiry.duration " + "should be greater than value of (ozone.manager.delegation.token.max-lifetime + " + - "ozone.manager.delegation.remover.scan.interval + hdds.secret.key.rotate.duration")); + "ozone.manager.delegation.remover.scan.interval + hdds.secret.key.rotate.duration"); } finally { if (scm != null) { scm.stop(); @@ -1357,14 +1356,11 @@ void validateCertificate(X509Certificate cert) throws Exception { assertThat(cn).isEqualTo(SCM_SUB_CA + "@localhost"); LocalDate today = ZonedDateTime.now().toLocalDate(); - Date invalidDate; // Make sure the end date is honored. - invalidDate = java.sql.Date.valueOf(today.plus(1, ChronoUnit.DAYS)); - assertTrue(cert.getNotAfter().after(invalidDate)); - - invalidDate = java.sql.Date.valueOf(today.plus(400, ChronoUnit.DAYS)); - assertTrue(cert.getNotAfter().before(invalidDate)); + assertThat(cert.getNotAfter()) + .isAfter(java.sql.Date.valueOf(today.plus(1, ChronoUnit.DAYS))) + .isBefore(java.sql.Date.valueOf(today.plus(400, ChronoUnit.DAYS))); assertThat(cert.getSubjectDN().toString()).contains(scmId); assertThat(cert.getSubjectDN().toString()).contains(clusterId);