You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2016/06/23 18:32:02 UTC
[02/11] hadoop git commit: MAPREDUCE-6641. TestTaskAttempt fails in
trunk. Contributed by Haibo Chen.
MAPREDUCE-6641. TestTaskAttempt fails in trunk. Contributed by Haibo Chen.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/69c21d2d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/69c21d2d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/69c21d2d
Branch: refs/heads/HDFS-1312
Commit: 69c21d2db099b3a4bb612fe2876fb448471829b3
Parents: 99e5dd6
Author: Akira Ajisaka <aa...@apache.org>
Authored: Thu Jun 23 13:25:25 2016 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Thu Jun 23 13:26:10 2016 +0900
----------------------------------------------------------------------
.../hadoop/mapreduce/v2/app/job/impl/TestTaskAttempt.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/69c21d2d/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskAttempt.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskAttempt.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskAttempt.java
index 1af60d8..61b780e 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskAttempt.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskAttempt.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.mapreduce.v2.app.job.impl;
+import static org.apache.hadoop.test.GenericTestUtils.waitFor;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -391,8 +392,8 @@ public class TestTaskAttempt{
Map<TaskAttemptId, TaskAttempt> attempts = task.getAttempts();
TaskAttempt attempt = attempts.values().iterator().next();
app.waitForState(attempt, TaskAttemptState.KILLED);
- Assert.assertTrue("No Ta Started JH Event", app.getTaStartJHEvent());
- Assert.assertTrue("No Ta Killed JH Event", app.getTaKilledJHEvent());
+ waitFor(app::getTaStartJHEvent, 100, 800);
+ waitFor(app::getTaKilledJHEvent, 100, 800);
}
static class FailingAttemptsMRApp extends MRApp {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org