Repository: incubator-ignite Updated Branches: refs/heads/ignite-633 0b5b90ea8 -> d8f4ca678
#[IGNITE-633]: reverted increased timeout. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d8f4ca67 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d8f4ca67 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d8f4ca67 Branch: refs/heads/ignite-633 Commit: d8f4ca678965fdd09a147bc9d7c68ea9485ee46e Parents: 0b5b90e Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Wed Jun 10 13:40:50 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Wed Jun 10 13:40:50 2015 +0300 ---------------------------------------------------------------------- .../processors/hadoop/HadoopMapReduceEmbeddedSelfTest.java | 5 ----- 1 file changed, 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d8f4ca67/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReduceEmbeddedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReduceEmbeddedSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReduceEmbeddedSelfTest.java index 7332aea..a329a95 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReduceEmbeddedSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopMapReduceEmbeddedSelfTest.java @@ -43,11 +43,6 @@ public class HadoopMapReduceEmbeddedSelfTest extends HadoopMapReduceTest { .put("flags", new HashMap<String, Boolean>()); /** {@inheritDoc} */ - @Override protected long getTestTimeout() { - return 8 * 60 * 1000; // Increased timeout, see https://issues.apache.org/jira/browse/IGNITE-633. - } - - /** {@inheritDoc} */ @Override public HadoopConfiguration hadoopConfiguration(String gridName) { HadoopConfiguration cfg = super.hadoopConfiguration(gridName);