You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2014/09/23 23:49:41 UTC
[4/6] git commit: Improve robustness of task manager test
Improve robustness of task manager test
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/6bd4d2c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/6bd4d2c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/6bd4d2c4
Branch: refs/heads/master
Commit: 6bd4d2c41d8830b21003916eb3a4c35957b0593b
Parents: b87f2fa
Author: Stephan Ewen <se...@apache.org>
Authored: Tue Sep 23 20:02:49 2014 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Tue Sep 23 20:02:49 2014 +0200
----------------------------------------------------------------------
.../apache/flink/runtime/taskmanager/TaskManagerTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/6bd4d2c4/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerTest.java
index 822f809..f5d401d 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerTest.java
@@ -255,17 +255,17 @@ public class TaskManagerTest {
Task t1 = tasks.get(eid1);
Task t2 = tasks.get(eid2);
- // wait until the tasks are done
+ // wait until the tasks are done. rare thread races may cause the tasks to be done before
+ // we get to the check, so we need to guard the check
if (t1 != null) {
t1.getEnvironment().getExecutingThread().join();
+ assertEquals(ExecutionState.FINISHED, t1.getExecutionState());
}
if (t2 != null) {
t2.getEnvironment().getExecutingThread().join();
+ assertEquals(ExecutionState.FINISHED, t2.getExecutionState());
}
- assertEquals(ExecutionState.FINISHED, t1.getExecutionState());
- assertEquals(ExecutionState.FINISHED, t2.getExecutionState());
-
tasks = tm.getAllRunningTasks();
assertEquals(0, tasks.size());