Repository: hadoop Updated Branches: refs/heads/branch-2 d77705c98 -> a75679cdb
HADOOP-11819. HttpServerFunctionalTest#prepareTestWebapp should create web app directory if it does not exist. (Contributed by Rohith) (cherry picked from commit b5a0b24643688270e77f85aaf1af24fee2c556cc) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a75679cd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a75679cd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a75679cd Branch: refs/heads/branch-2 Commit: a75679cdb33e07fb982bac02fbe295192a0eb78a Parents: d77705c Author: Vinayakumar B <[email protected]> Authored: Tue Apr 14 11:58:12 2015 +0530 Committer: Vinayakumar B <[email protected]> Committed: Tue Apr 14 11:59:07 2015 +0530 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../apache/hadoop/http/HttpServerFunctionalTest.java | 12 +++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a75679cd/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 742a054..c77bbb7 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -50,6 +50,9 @@ Release 2.8.0 - UNRELEASED HADOOP-7713. dfs -count -q should label output column (Jonathan Allen via aw) + HADOOP-11819. HttpServerFunctionalTest#prepareTestWebapp should create web + app directory if it does not exist. (Rohith via vinayakumarb) + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp http://git-wip-us.apache.org/repos/asf/hadoop/blob/a75679cd/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/HttpServerFunctionalTest.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/HttpServerFunctionalTest.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/HttpServerFunctionalTest.java index 4a4de41..faa27a7 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/HttpServerFunctionalTest.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/HttpServerFunctionalTest.java @@ -123,11 +123,13 @@ public class HttpServerFunctionalTest extends Assert { File testWebappDir = new File(webapps + File.separatorChar + TEST); try { - if (!testWebappDir.exists()) { - fail("Test webapp dir " + testWebappDir.getCanonicalPath() + " missing"); - } - } - catch (IOException e) { + if (!testWebappDir.exists()) { + if (!testWebappDir.mkdirs()) { + fail("Test webapp dir " + testWebappDir.getCanonicalPath() + + " can not be created"); + } + } + } catch (IOException e) { } }
