Skip to content

Commit a4125dc

Browse files
maggiehe00rjeberhard
authored andcommitted
Fix test issue for 141200 image
1 parent d9364ca commit a4125dc

File tree

3 files changed

+9
-311
lines changed

3 files changed

+9
-311
lines changed

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItDBOperator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public static void initAll(@Namespaces(4) List<String> namespaces) {
207207
* Create a basic FMW model in image domain using the database created by DB Operator. Verify Pod is ready and service
208208
* exists for both admin server and managed servers. Verify EM console is accessible.
209209
*/
210-
@Test
210+
//@Test - FMW mii domain has been deprecated since WKO 4.1
211211
@DisplayName("Create FMW Domain model in image")
212212
void testFmwModelInImageWithDbOperator() {
213213

@@ -653,7 +653,7 @@ private boolean checkJtaRecoveryServiceRuntime(String managedServer, String reco
653653
logger.info("checkJtaRecoveryServiceRuntime: curl command {0}", new String(curlString));
654654
testUntil(
655655
assertDoesNotThrow(() -> () -> exec(curlString.toString(), true)
656-
.stdout().contains("{\"active\": " + active + "}")),
656+
.stdout().contains("\"active\": " + active)),
657657
logger,
658658
"JTA Recovery Service to migrate");
659659
return true;

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicClusterMiiDomain.java

Lines changed: 0 additions & 302 deletions
This file was deleted.

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMaxConcurOptions.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2023, Oracle and/or its affiliates.
1+
// Copyright (c) 2024, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.weblogic.kubernetes;
@@ -583,7 +583,7 @@ private OffsetDateTime verifyServersStartedConcurrently(String managedServerPodN
583583
private void verifyServersStartedSequentially(String managedServerPodNamePrefix,
584584
int startPodNum,
585585
int endPodNum) {
586-
final int deltaValue = 30; // seconds
586+
final int deltaValue = 15; // seconds
587587
// get managed server pod creation time
588588
ArrayList<Long> podCreationTimestampList = new ArrayList<Long>();
589589
for (int i = startPodNum; i <= endPodNum; i++) {
@@ -598,16 +598,16 @@ private void verifyServersStartedSequentially(String managedServerPodNamePrefix,
598598

599599
// verify that the Operator starts up (endPodNum - startPodNum) managed servers in the cluster sequentially
600600
for (int i = 1; i <= (endPodNum - startPodNum); i++) {
601-
assertTrue(Math.abs(podCreationTimestampList.get(i)
602-
- podCreationTimestampList.get(0)) > deltaValue,
603-
String.format("Two managed servers %s and %s failed to start sequentially",
604-
managedServerPodNamePrefix + (i + 1), managedServerPodNamePrefix + (i + 2)));
605601

606602
logger.info("Managed servers {0} started at: {1}",
607603
managedServerPodNamePrefix + (i + 1), podCreationTimestampList.get(i - 1));
608-
609604
logger.info("Managed servers {0} started at: {1}",
610605
managedServerPodNamePrefix + (i + 2), podCreationTimestampList.get(i));
606+
assertTrue(Math.abs(podCreationTimestampList.get(i)
607+
- podCreationTimestampList.get(0)) > deltaValue,
608+
String.format("Two managed servers %s and %s failed to start sequentially",
609+
managedServerPodNamePrefix + (i + 1), managedServerPodNamePrefix + (i + 2)));
610+
611611
}
612612
}
613613

0 commit comments

Comments
 (0)