This is an automated email from the ASF dual-hosted git repository. chesnay pushed a commit to branch release-1.15 in repository https://gitbox.apache.org/repos/asf/flink.git
commit df874ad72513771b3a3f2473dbcd60d672d668fa Author: Chesnay Schepler <[email protected]> AuthorDate: Mon Apr 11 12:00:41 2022 +0200 [hotfix][tests] Wait for JobManagerRunner termination Need to make sure the job manager runner is complete, because the test runner does not implement required methods to query job details. --- .../org/apache/flink/runtime/dispatcher/DispatcherTest.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java index e806583c8cc..b2476562b10 100755 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/dispatcher/DispatcherTest.java @@ -420,7 +420,7 @@ public class DispatcherTest extends AbstractDispatcherTest { .build()))); // wait for job to finish - dispatcherGateway.requestJobResult(jobId, TIMEOUT).get(); + dispatcher.getJobTerminationFuture(jobId, TIMEOUT).get(); // sanity check assertThat( dispatcherGateway.requestJobStatus(jobId, TIMEOUT).get(), is(JobStatus.CANCELED)); @@ -454,7 +454,7 @@ public class DispatcherTest extends AbstractDispatcherTest { .build()))); // wait for job to finish - dispatcherGateway.requestJobResult(jobId, TIMEOUT).get(); + dispatcher.getJobTerminationFuture(jobId, TIMEOUT).get(); // sanity check assertThat( dispatcherGateway.requestJobStatus(jobId, TIMEOUT).get(), is(JobStatus.FINISHED)); @@ -541,7 +541,7 @@ public class DispatcherTest extends AbstractDispatcherTest { testFailure)); // wait till job has failed - dispatcherGateway.requestJobResult(jobId, TIMEOUT).get(); + dispatcher.getJobTerminationFuture(jobId, TIMEOUT).get(); // get failure cause ArchivedExecutionGraph execGraph = @@ -949,7 +949,7 @@ public class DispatcherTest extends AbstractDispatcherTest { jobMasterLeaderElectionService.isLeader(UUID.randomUUID()); dispatcherGateway.submitJob(jobGraph, TIMEOUT).get(); - dispatcherGateway.requestJobResult(jobId, TIMEOUT).get(); + dispatcher.getJobTerminationFuture(jobId, TIMEOUT).get(); assertOnlyContainsSingleJobWithState( JobStatus.SUSPENDED, dispatcherGateway.requestMultipleJobDetails(TIMEOUT).get()); @@ -995,6 +995,8 @@ public class DispatcherTest extends AbstractDispatcherTest { // run second job, which completes with FINISHED dispatcherGateway.submitJob(jobGraph, TIMEOUT).get(); + dispatcher.getJobTerminationFuture(jobId, TIMEOUT).get(); + assertOnlyContainsSingleJobWithState( JobStatus.FINISHED, dispatcherGateway.requestMultipleJobDetails(TIMEOUT).get()); } @@ -1010,7 +1012,7 @@ public class DispatcherTest extends AbstractDispatcherTest { jobMasterLeaderElectionService.isLeader(UUID.randomUUID()); dispatcherGateway.submitJob(jobGraph, TIMEOUT).get(); - dispatcherGateway.requestJobResult(jobId, TIMEOUT).get(); + dispatcher.getJobTerminationFuture(jobId, TIMEOUT).get(); final MultipleJobsDetails multipleJobsDetails = dispatcherGateway.requestMultipleJobDetails(TIMEOUT).get();
