Repository: tez Updated Branches: refs/heads/branch-0.7 27b0f2fab -> 4e93cea68
TEZ-2300. fixup (cherry picked from commit 6e02509bb823bfe606ef2571a7542d0f27a2195f) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/4e93cea6 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/4e93cea6 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/4e93cea6 Branch: refs/heads/branch-0.7 Commit: 4e93cea68fa913f149c157076656ffe30c7c0976 Parents: 27b0f2f Author: Jonathan Eagles <[email protected]> Authored: Fri Aug 28 13:06:50 2015 -0500 Committer: Jonathan Eagles <[email protected]> Committed: Fri Aug 28 13:07:27 2015 -0500 ---------------------------------------------------------------------- tez-api/src/test/java/org/apache/tez/client/TestTezClient.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/4e93cea6/tez-api/src/test/java/org/apache/tez/client/TestTezClient.java ---------------------------------------------------------------------- diff --git a/tez-api/src/test/java/org/apache/tez/client/TestTezClient.java b/tez-api/src/test/java/org/apache/tez/client/TestTezClient.java index 7f44380..3ad95dd 100644 --- a/tez-api/src/test/java/org/apache/tez/client/TestTezClient.java +++ b/tez-api/src/test/java/org/apache/tez/client/TestTezClient.java @@ -121,7 +121,6 @@ public class TestTezClient { } conf.setBoolean(TezConfiguration.TEZ_IGNORE_LIB_URIS, true); conf.setBoolean(TezConfiguration.TEZ_AM_SESSION_MODE, isSession); - conf.setLong(TezConfiguration.TEZ_CLIENT_HARD_KILL_TIMEOUT_MS, HARD_KILL_TIMEOUT); TezClientForTest client = new TezClientForTest("test", conf, lrs, null); ApplicationId appId1 = ApplicationId.newInstance(0, 1); @@ -436,6 +435,7 @@ public class TestTezClient { public void testStopRetriesUntilTerminalState() throws Exception { TezConfiguration conf = new TezConfiguration(); conf.setBoolean(TezConfiguration.TEZ_CLIENT_ASYNCHRONOUS_STOP, false); + conf.setLong(TezConfiguration.TEZ_CLIENT_HARD_KILL_TIMEOUT_MS, HARD_KILL_TIMEOUT); final TezClientForTest client = configureAndCreateTezClient(conf); client.start(); when(client.mockYarnClient.getApplicationReport(client.mockAppId).getYarnApplicationState()) @@ -452,6 +452,7 @@ public class TestTezClient { public void testStopRetriesUntilTimeout() throws Exception { TezConfiguration conf = new TezConfiguration(); conf.setBoolean(TezConfiguration.TEZ_CLIENT_ASYNCHRONOUS_STOP, false); + conf.setLong(TezConfiguration.TEZ_CLIENT_HARD_KILL_TIMEOUT_MS, HARD_KILL_TIMEOUT); final TezClientForTest client = configureAndCreateTezClient(conf); client.start(); when(client.mockYarnClient.getApplicationReport(client.mockAppId).getYarnApplicationState())
