[FLINK-10913] Harden ExecutionGraphRestartTest#testRestartAutomatically

Wait until all Executions reach the state DEPLOYING instead of having a resource assigned.

Author: tillrohrmann

flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/ExecutionGraphRestartTest.java

@@ -973,7 +973,7 @@ private static void restartAfterFailure(ExecutionGraph eg, FiniteDuration timeou
 
 		// 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 @@ private static void restartAfterFailure(ExecutionGraph eg, FiniteDuration timeou
 		}
 	}
 
+	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,