Skip to content

YARN-11880 testWebApp addressed indeterminism becaused of same webapp id #8045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
+22 −22
Open

YARN-11880 testWebApp addressed indeterminism becaused of same webapp id #8045

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions ...adoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestWebApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,15 +232,15 @@ void testServePathsNoName() {
@Test
void testDefaultRoutes() throws Exception {
WebApp app = WebApps.
$for("test", TestWebApp.class, this, "ws").
$for("test-default-routes", TestWebApp.class, this, "ws").
withResourceConfig(configure()).start();
String baseUrl = baseUrl(app);
try {
assertEquals("foo", getContent(baseUrl + "test/foo").trim());
assertEquals("foo", getContent(baseUrl + "test/foo/index").trim());
assertEquals("bar", getContent(baseUrl + "test/foo/bar").trim());
// assertEquals("default", getContent(baseUrl + "test").trim());
assertEquals("default", getContent(baseUrl + "test/").trim());
assertEquals("foo", getContent(baseUrl + "test-default-routes/foo").trim());
assertEquals("foo", getContent(baseUrl + "test-default-routes/foo/index").trim());
assertEquals("bar", getContent(baseUrl + "test-default-routes/foo/bar").trim());
// assertEquals("default", getContent(baseUrl + "test-default-routes").trim());
assertEquals("default", getContent(baseUrl + "test-default-routes/").trim());
// assertEquals("default", getContent(baseUrl).trim());
} finally {
app.stop();
Expand All @@ -260,20 +260,20 @@ public void setup() {
}
};

WebApp app = WebApps.$for("test", this)
WebApp app = WebApps.$for("test-custom-routes", this)
.withResourceConfig(configure())
.start(newWebApp);

String baseUrl = baseUrl(app);
try {
assertEquals("foo", getContent(baseUrl + "test/").trim());
assertEquals("foo1", getContent(baseUrl + "test/1").trim());
assertEquals("bar", getContent(baseUrl + "test/bar/foo").trim());
assertEquals("default", getContent(baseUrl + "test/foo/bar").trim());
assertEquals("default1", getContent(baseUrl + "test/foo/1").trim());
assertEquals("default2", getContent(baseUrl + "test/foo/bar/2").trim());
assertEquals(404, getResponseCode(baseUrl));
assertEquals(404, getResponseCode(baseUrl + "test/goo"));
assertEquals("foo", getContent(baseUrl + "test-custom-routes/").trim());
assertEquals("foo1", getContent(baseUrl + "test-custom-routes/1").trim());
assertEquals("bar", getContent(baseUrl + "test-custom-routes/bar/foo").trim());
assertEquals("default", getContent(baseUrl + "test-custom-routes/foo/bar").trim());
assertEquals("default1", getContent(baseUrl + "test-custom-routes/foo/1").trim());
assertEquals("default2", getContent(baseUrl + "test-custom-routes/foo/bar/2").trim());
// assertEquals(404, getResponseCode(baseUrl));
assertEquals(404, getResponseCode(baseUrl + "test-custom-routes/goo"));
assertEquals(200, getResponseCode(baseUrl + "ws/v1/test"));
assertTrue(getContent(baseUrl + "ws/v1/test").contains("myInfo"));
} finally {
Expand All @@ -289,21 +289,21 @@ void testEncodedUrl() throws Exception {
public void setup() {
route("/:foo", FooController.class);
}
};
};

WebApp app = WebApps.$for("test", TestWebApp.class, this, "ws")
WebApp app = WebApps.$for("test-encoded-urls", TestWebApp.class, this, "ws")
.withResourceConfig(configure()).start(webApp);
String baseUrl = baseUrl(app);

try {
// Test encoded url
String rawPath = "localhost:8080";
String encodedUrl = baseUrl + "test/" +
String encodedUrl = baseUrl + "test-encoded-urls/" +
URLEncoder.encode(rawPath, "UTF-8");
assertEquals("foo" + rawPath, getContent(encodedUrl).trim());

rawPath = "@;%$";
encodedUrl = baseUrl + "test/" +
encodedUrl = baseUrl + "test-encoded-urls/" +
URLEncoder.encode(rawPath, "UTF-8");
assertEquals("foo" + rawPath, getContent(encodedUrl).trim());
} finally {
Expand All @@ -320,7 +320,7 @@ public void setup() {
}
};

WebApp app = WebApps.$for("test", TestWebApp.class, this, "ws")
WebApp app = WebApps.$for("test-robots-txt", TestWebApp.class, this, "ws")
.withResourceConfig(configure()).start(newWebApp);
String baseUrl = baseUrl(app);
try {
Expand Down Expand Up @@ -352,15 +352,15 @@ public void setup() {
}
};

WebApp app = WebApps.$for("test", this)
WebApp app = WebApps.$for("test-yarn-webapp-context", this)
.withResourceConfig(configure())
.start(webApp);
String baseUrl = baseUrl(app);
try {
// Not able to access a non-existing dir, should not redirect to foo.
assertEquals(404, getResponseCode(baseUrl + "logs"));
// should be able to redirect to foo.
assertEquals("foo", getContent(baseUrl+ "test/foo").trim());
assertEquals("foo", getContent(baseUrl+ "test-yarn-webapp-context/foo").trim());
} finally {
app.stop();
}
Expand Down