From 4bcbc445d71bb60c26727c0f65596e00628e615f Mon Sep 17 00:00:00 2001 From: Marina Kogan Date: Mon, 8 Nov 2021 22:56:16 +0000 Subject: [PATCH 1/3] introver fix --- .../oracle/weblogic/kubernetes/ItIntrospectVersion.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java index 6881bf0e9e2..ed72338acfe 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java @@ -52,6 +52,7 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; +import org.opentest4j.AssertionFailedError; import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT; import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_PATCH; @@ -1133,7 +1134,12 @@ void testIntrospectDomainScript() { // verify when a domain resource has spec.introspectVersion configured, // after a introspectVersion is modified, new server pods have the label // "weblogic.introspectVersion" set as well. - verifyIntrospectVersionLabelInPod(replicaCount); + try { + verifyIntrospectVersionLabelInPod(replicaCount); + } catch (AssertionFailedError error) { + //retry to check version + verifyIntrospectVersionLabelInPod(replicaCount); + } // use introspectDomain.sh to initiate introspection logger.info("Initiate introspection with non numeric string with space"); From 83c1adf67760df72fbecee6cfa35c71d33f5ad5a Mon Sep 17 00:00:00 2001 From: Marina Kogan Date: Mon, 8 Nov 2021 23:19:39 +0000 Subject: [PATCH 2/3] fixed retry --- .../oracle/weblogic/kubernetes/ItIntrospectVersion.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java index ed72338acfe..5aa53b9192f 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java @@ -1134,6 +1134,14 @@ void testIntrospectDomainScript() { // verify when a domain resource has spec.introspectVersion configured, // after a introspectVersion is modified, new server pods have the label // "weblogic.introspectVersion" set as well. + testUntil( + () -> { + assertDoesNotThrow(() -> verifyIntrospectVersionLabelInPod(replicaCount)); + return true; + }, + logger, + " Running verifyIntrospectVersionLabelInPod"); + try { verifyIntrospectVersionLabelInPod(replicaCount); } catch (AssertionFailedError error) { From e717b0254ce9176f433e80e41d93ed606abe04b0 Mon Sep 17 00:00:00 2001 From: Marina Kogan Date: Tue, 9 Nov 2021 19:38:22 +0000 Subject: [PATCH 3/3] deleted unneeded try block --- .../oracle/weblogic/kubernetes/ItIntrospectVersion.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java index 5aa53b9192f..b59420b4be5 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java @@ -52,7 +52,6 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import org.opentest4j.AssertionFailedError; import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT; import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_PATCH; @@ -1142,12 +1141,6 @@ void testIntrospectDomainScript() { logger, " Running verifyIntrospectVersionLabelInPod"); - try { - verifyIntrospectVersionLabelInPod(replicaCount); - } catch (AssertionFailedError error) { - //retry to check version - verifyIntrospectVersionLabelInPod(replicaCount); - } // use introspectDomain.sh to initiate introspection logger.info("Initiate introspection with non numeric string with space");