Skip to content

Commit 4094e4e

Browse files
committed
Make sure the thread joins before we save the stdout
1 parent e5c5d46 commit 4094e4e

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDomain.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -519,21 +519,21 @@ public void testAddSecondApp() {
519519
// do nothing
520520
}
521521

522-
// check and wait for the original app to be ready
522+
// check and wait for the new app to be ready
523523
checkAppRunning(
524524
domainUID,
525525
domainNamespace,
526526
"8001",
527-
"sample-war/index.jsp",
528-
APP_RESPONSE_V2);
529-
530-
// check and wait for the new app to be ready
527+
"sample-war-3/index.jsp",
528+
APP_RESPONSE_V3);
529+
530+
// check and wait for the original app to be ready
531531
checkAppRunning(
532532
domainUID,
533533
domainNamespace,
534534
"8001",
535-
"sample-war-3/index.jsp",
536-
APP_RESPONSE_V3);
535+
"sample-war/index.jsp",
536+
APP_RESPONSE_V2);
537537

538538
logger.info("The cluster has been rolling started, and the two applications are both running correctly.");
539539
}

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/ExecCommand.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,12 @@ public static ExecResult exec(
8484
}
8585

8686
p.waitFor();
87-
87+
88+
if (out != null) {
89+
out.join();
90+
out = null;
91+
}
92+
8893
return new ExecResult(p.exitValue(), read(in.getInputStream()), read(p.getErrorStream()));
8994

9095
} finally {

0 commit comments

Comments
 (0)