Skip to content

[SPARK-7444][Tests] Eliminate noisy css warn/error logs for UISeleniumSuite #5983

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

Closed
zsxwing wants to merge 4 commits into from
Closed

[SPARK-7444][Tests] Eliminate noisy css warn/error logs for UISeleniumSuite #5983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a59f40e
Eliminate noisy css warn/error logs for UISeleniumSuite
zsxwing May 7, 2015
7bb7f11
Merge branch 'master' into SPARK-7444
zsxwing May 8, 2015
d1398ad
Merge remote-tracking branch 'origin/master' into SPARK-7444
zsxwing Jun 8, 2015
4202728
Add SparkUICssErrorHandler for all tests
zsxwing Jun 8, 2015
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
31 changes: 30 additions & 1 deletion core/src/test/scala/org/apache/spark/ui/UISeleniumSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
import scala.collection.JavaConversions._
import scala.xml.Node

import com.gargoylesoftware.htmlunit.DefaultCssErrorHandler
import org.json4s._
import org.json4s.jackson.JsonMethods
import org.openqa.selenium.htmlunit.HtmlUnitDriver
Expand All @@ -31,6 +32,7 @@ import org.scalatest._
import org.scalatest.concurrent.Eventually._
import org.scalatest.selenium.WebBrowser
import org.scalatest.time.SpanSugar._
import org.w3c.css.sac.CSSParseException

import org.apache.spark.LocalSparkContext._
import org.apache.spark._
Expand All @@ -39,6 +41,31 @@ import org.apache.spark.deploy.history.HistoryServerSuite
import org.apache.spark.shuffle.FetchFailedException
import org.apache.spark.status.api.v1.{JacksonMessageWriter, StageStatus}

private[spark] class SparkUICssErrorHandler extends DefaultCssErrorHandler {

private val cssWhiteList = List("bootstrap.min.css", "vis.min.css")

private def isInWhileList(uri: String): Boolean = cssWhiteList.exists(uri.endsWith)

override def warning(e: CSSParseException): Unit = {
if (!isInWhileList(e.getURI)) {
super.warning(e)
}
}

override def fatalError(e: CSSParseException): Unit = {
if (!isInWhileList(e.getURI)) {
super.fatalError(e)
}
}

override def error(e: CSSParseException): Unit = {
if (!isInWhileList(e.getURI)) {
super.error(e)
}
}
}

/**
* Selenium tests for the Spark Web UI.
*/
Expand All @@ -49,7 +76,9 @@ class UISeleniumSuite extends SparkFunSuite with WebBrowser with Matchers with B


override def beforeAll(): Unit = {
webDriver = new HtmlUnitDriver
webDriver = new HtmlUnitDriver {
getWebClient.setCssErrorHandler(new SparkUICssErrorHandler)
}
}

override def afterAll(): Unit = {
Expand Down
7 changes: 5 additions & 2 deletions ...-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/UISeleniumSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@ import scala.util.Random
import org.apache.hadoop.hive.conf.HiveConf.ConfVars
import org.openqa.selenium.WebDriver
import org.openqa.selenium.htmlunit.HtmlUnitDriver
import org.scalatest.{BeforeAndAfterAll, Matchers}
import org.scalatest.concurrent.Eventually._
import org.scalatest.selenium.WebBrowser
import org.scalatest.time.SpanSugar._
import org.scalatest.{BeforeAndAfterAll, Matchers}

import org.apache.spark.sql.hive.HiveContext
import org.apache.spark.ui.SparkUICssErrorHandler

class UISeleniumSuite
extends HiveThriftJdbcTest
Expand All @@ -40,7 +41,9 @@ class UISeleniumSuite
override def mode: ServerMode.Value = ServerMode.binary

override def beforeAll(): Unit = {
webDriver = new HtmlUnitDriver
webDriver = new HtmlUnitDriver {
getWebClient.setCssErrorHandler(new SparkUICssErrorHandler)
}
super.beforeAll()
}

Expand Down
2 changes: 1 addition & 1 deletion streaming/src/main/resources/org/apache/spark/streaming/ui/static/streaming-page.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
}

.tooltip-inner {
max-width: 500px !important; // Make sure we only have one line tooltip
max-width: 500px !important; /* Make sure we only have one line tooltip */
}

.line {
Expand Down
7 changes: 5 additions & 2 deletions streaming/src/test/scala/org/apache/spark/streaming/UISeleniumSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,20 @@ import org.scalatest.selenium.WebBrowser
import org.scalatest.time.SpanSugar._

import org.apache.spark._
import org.apache.spark.ui.SparkUICssErrorHandler

/**
* Selenium tests for the Spark Web UI.
* Selenium tests for the Spark Streaming Web UI.
*/
class UISeleniumSuite
extends SparkFunSuite with WebBrowser with Matchers with BeforeAndAfterAll with TestSuiteBase {

implicit var webDriver: WebDriver = _

override def beforeAll(): Unit = {
webDriver = new HtmlUnitDriver
webDriver = new HtmlUnitDriver {
getWebClient.setCssErrorHandler(new SparkUICssErrorHandler)
}
}

override def afterAll(): Unit = {
Expand Down