[flink] branch release-1.7 updated: [FLINK-10913] Harden ExecutionGraphRestartTest#testRestartAutomatically

[trohrmann]

This is an automated email from the ASF dual-hosted git repository.

trohrmann pushed a commit to branch release-1.7
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/release-1.7 by this push:
     new 1b8b7ae5 [FLINK-10913] Harden 
ExecutionGraphRestartTest#testRestartAutomatically
1b8b7ae5 is described below

commit 1b8b7ae5930ce9d5625e7590cb40b3f1799aa84b
Author: Till Rohrmann <trohrm...@apache.org>
AuthorDate: Sat Nov 17 11:42:42 2018 +0100

    [FLINK-10913] Harden ExecutionGraphRestartTest#testRestartAutomatically
    
    Wait until all Executions reach the state DEPLOYING instead of having a 
resource assigned.
---
 .../flink/runtime/executiongraph/ExecutionGraphRestartTest.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git 
a/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ExecutionGraphRestartTest.java
 
b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ExecutionGraphRestartTest.java
index 91510d1..ffe1fd0 100644
--- 
a/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ExecutionGraphRestartTest.java
+++ 
b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ExecutionGraphRestartTest.java
@@ -973,7 +973,7 @@ public class ExecutionGraphRestartTest extends TestLogger {
 
                // Wait for deploying after async restart
                Deadline deadline = timeout.fromNow();
-               waitForAllResourcesToBeAssignedAfterAsyncRestart(eg, deadline);
+               waitUntilAllExecutionsReachDeploying(eg, deadline);
 
                if (haltAfterRestart) {
                        if (deadline.hasTimeLeft()) {
@@ -984,6 +984,13 @@ public class ExecutionGraphRestartTest extends TestLogger {
                }
        }
 
+       private static void waitUntilAllExecutionsReachDeploying(ExecutionGraph 
eg, Deadline deadline) throws TimeoutException {
+               ExecutionGraphTestUtils.waitForAllExecutionsPredicate(
+                       eg,
+                       
ExecutionGraphTestUtils.isInExecutionState(ExecutionState.DEPLOYING),
+                       deadline.timeLeft().toMillis());
+       }
+
        private static void 
waitForAllResourcesToBeAssignedAfterAsyncRestart(ExecutionGraph eg, Deadline 
deadline) throws TimeoutException {
                ExecutionGraphTestUtils.waitForAllExecutionsPredicate(
                        eg,