From 1889f769c32c018d45a577a2cb50212280d9c246 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Fri, 9 Feb 2024 16:54:26 -0800 Subject: [PATCH] [SPARK-47020][CORE] Fix `RealBrowserUISeleniumSuite` --- .../spark/ui/RealBrowserUISeleniumSuite.scala | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/core/src/test/scala/org/apache/spark/ui/RealBrowserUISeleniumSuite.scala b/core/src/test/scala/org/apache/spark/ui/RealBrowserUISeleniumSuite.scala index b0f1fcab63be8..709ee98be1e33 100644 --- a/core/src/test/scala/org/apache/spark/ui/RealBrowserUISeleniumSuite.scala +++ b/core/src/test/scala/org/apache/spark/ui/RealBrowserUISeleniumSuite.scala @@ -73,8 +73,8 @@ abstract class RealBrowserUISeleniumSuite(val driverProp: String) // Open DAG Viz. webDriver.findElement(By.id("job-dag-viz")).click() - val nodeDesc = webDriver.findElement(By.cssSelector("g[class='node_0 node']")) - nodeDesc.getAttribute("name") should include ("collect at <console>:25") + val nodeDesc = webDriver.findElement(By.cssSelector("g[id='node_0']")) + nodeDesc.getAttribute("innerHTML") should include ("collect at <console>:25") } } } @@ -109,22 +109,20 @@ abstract class RealBrowserUISeleniumSuite(val driverProp: String) goToUi(sc, "/jobs/job/?id=0") webDriver.findElement(By.id("job-dag-viz")).click() - val stage0 = webDriver.findElement(By.cssSelector("g[id='graph_0']")) - val stage1 = webDriver.findElement(By.cssSelector("g[id='graph_1']")) + val stage0 = webDriver.findElement(By.cssSelector("g[id='graph_stage_0']")) + .findElement(By.xpath("..")) + val stage1 = webDriver.findElement(By.cssSelector("g[id='graph_stage_1']")) + .findElement(By.xpath("..")) val barrieredOps = webDriver.findElements(By.className("barrier-rdd")).iterator() - - while (barrieredOps.hasNext) { - val barrieredOpId = barrieredOps.next().getAttribute("innerHTML") - val foundInStage0 = - stage0.findElements( - By.cssSelector("g.barrier.cluster.cluster_" + barrieredOpId)) - assert(foundInStage0.size === 1) - - val foundInStage1 = - stage1.findElements( - By.cssSelector("g.barrier.cluster.cluster_" + barrieredOpId)) - assert(foundInStage1.size === 0) - } + val id1 = barrieredOps.next().getAttribute("innerHTML") + val id2 = barrieredOps.next().getAttribute("innerHTML") + assert(!barrieredOps.hasNext()) + + val prefix = "g[class='cluster barrier']#cluster_" + assert(stage0.findElements(By.cssSelector(s"${prefix}$id1")).size === 1) + assert(stage0.findElements(By.cssSelector(s"${prefix}$id2")).size === 1) + assert(stage1.findElements(By.cssSelector(s"${prefix}$id1")).size === 0) + assert(stage1.findElements(By.cssSelector(s"${prefix}$id2")).size === 1) } } }