Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-1868. Merging change r1598686 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598690 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Nauroth 2014-05-30 18:18:18 +00:00
parent 2e8259ae25
commit 2a5f932bdb
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -156,6 +156,9 @@ Release 2.5.0 - UNRELEASED
that both Timeline Server and client can access them. (Zhijie Shen via
vinodkv)
YARN-1868. YARN status web ui does not show correctly in IE 11.
(Chuan Liu via cnauroth)
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES

3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/HtmlPage.java
View File

@ -79,7 +79,8 @@ protected HtmlPage(ViewContext ctx) {
@Override
public void render() {
puts(DOCTYPE);
render(page().html().meta_http("Content-type", MimeType.HTML));
render(page().html().meta_http("X-UA-Compatible", "IE=8")
.meta_http("Content-type", MimeType.HTML));
if (page().nestLevel() != 0) {
throw new WebAppException("Error rendering page: nestLevel="+
page().nestLevel());

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestSubViews.java
View File

@ -70,6 +70,6 @@ public void render(Block html) {
out.flush();
verify(out).print("sub1 text");
verify(out).print("sub2 text");
verify(out, times(15)).println(); // test inline transition across views
verify(out, times(16)).println(); // test inline transition across views
}
}

9
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestHtmlPage.java
View File

@ -22,11 +22,12 @@
import java.io.PrintWriter;
import org.apache.hadoop.yarn.webapp.MimeType;
import org.apache.hadoop.yarn.webapp.WebAppException;
import org.apache.hadoop.yarn.webapp.test.WebAppTests;
import org.apache.hadoop.yarn.webapp.view.HtmlPage;
import org.junit.Test;
import static org.mockito.Mockito.*;
public class TestHtmlPage {
@ -53,6 +54,12 @@ public void render(Page.HTML<_> html) {
Injector injector = WebAppTests.testPage(TestView.class);
PrintWriter out = injector.getInstance(PrintWriter.class);
// Verify the HTML page has correct meta tags in the header
verify(out).print(" http-equiv=\"X-UA-Compatible\"");
verify(out).print(" content=\"IE=8\"");
verify(out).print(" http-equiv=\"Content-type\"");
verify(out).print(String.format(" content=\"%s\"", MimeType.HTML));
verify(out).print("test");
verify(out).print(" id=\"testid\"");
verify(out).print("test note");