Repository: hadoop Updated Branches: refs/heads/branch-2.7 22b9a6ce4 -> 47e1eabf7
YARN-5469. Increase timeout of TestAmFilter.testFilter. Contributed by Eric Badger (cherry picked from commit db4a61dc617954cf448a0d44cb4ac79f2abf9db3) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/47e1eabf Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/47e1eabf Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/47e1eabf Branch: refs/heads/branch-2.7 Commit: 47e1eabf79b5adb1cc50ad2267bd018fd6ba4848 Parents: 22b9a6c Author: Jason Lowe <jl...@apache.org> Authored: Wed Aug 3 19:55:59 2016 +0000 Committer: Jason Lowe <jl...@apache.org> Committed: Wed Aug 3 19:55:59 2016 +0000 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../apache/hadoop/yarn/server/webproxy/amfilter/TestAmFilter.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/47e1eabf/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 4136a47..0602998 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -32,6 +32,9 @@ Release 2.7.4 - UNRELEASED fails Intermittently due to IllegalArgumentException from cleanup (Daniel Templeton via rkanter) + YARN-5469. Increase timeout of TestAmFilter.testFilter (Eric Badger via + jlowe) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/47e1eabf/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/amfilter/TestAmFilter.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/amfilter/TestAmFilter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/amfilter/TestAmFilter.java index 4601c20..6f64777 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/amfilter/TestAmFilter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/amfilter/TestAmFilter.java @@ -123,7 +123,7 @@ public class TestAmFilter { /** * Test AmIpFilter */ - @Test(timeout = 1000) + @Test(timeout = 10000) @SuppressWarnings("deprecation") public void testFilter() throws Exception { Map<String, String> params = new HashMap<String, String>(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
