From cd5388cdc1e77088595eb51da63419d4a088aa77 Mon Sep 17 00:00:00 2001
From: Beako <89321535+18chanp1@users.noreply.github.com>
Date: Tue, 21 Oct 2025 15:47:11 -0500
Subject: [PATCH] YARN-11880 testWebApp addressed indeterminism becaused of
 same webapp id

---
 .../apache/hadoop/yarn/webapp/TestWebApp.java | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestWebApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestWebApp.java
index 99161ce9da946..fdd1262df43e1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestWebApp.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestWebApp.java
@@ -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();
@@ -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 {
@@ -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 {
@@ -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 {
@@ -352,7 +352,7 @@ 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);
@@ -360,7 +360,7 @@ public void setup() {
       // 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();
     }