From 68f787c474f0b70641effca8717bf5eabefd6b2b Mon Sep 17 00:00:00 2001 From: Adrien Piquerez Date: Wed, 5 Jun 2024 14:17:59 +0200 Subject: [PATCH] Disable twirl tests in BuildServerTest --- server-test/src/server-test/buildserver/build.sbt | 6 +++--- server-test/src/server-test/buildserver/project/plugins.sbt | 2 +- server-test/src/test/scala/testpkg/BuildServerTest.scala | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server-test/src/server-test/buildserver/build.sbt b/server-test/src/server-test/buildserver/build.sbt index 158b80df1..838a60d02 100644 --- a/server-test/src/server-test/buildserver/build.sbt +++ b/server-test/src/server-test/buildserver/build.sbt @@ -43,9 +43,9 @@ lazy val javaProj = project javacOptions += "-Xlint:all" ) -lazy val twirlProj = project - .in(file("twirlProj")) - .enablePlugins(SbtTwirl) +// lazy val twirlProj = project +// .in(file("twirlProj")) +// .enablePlugins(SbtTwirl) def somethingBad = throw new MessageOnlyException("I am a bad build target") // other build targets should not be affected by this bad build target diff --git a/server-test/src/server-test/buildserver/project/plugins.sbt b/server-test/src/server-test/buildserver/project/plugins.sbt index 8ee7ebeaa..721e2f251 100644 --- a/server-test/src/server-test/buildserver/project/plugins.sbt +++ b/server-test/src/server-test/buildserver/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.5.2") \ No newline at end of file +// addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.5.2") diff --git a/server-test/src/test/scala/testpkg/BuildServerTest.scala b/server-test/src/test/scala/testpkg/BuildServerTest.scala index 3247f1994..122dc44e4 100644 --- a/server-test/src/test/scala/testpkg/BuildServerTest.scala +++ b/server-test/src/test/scala/testpkg/BuildServerTest.scala @@ -172,7 +172,7 @@ class BuildServerTest extends AbstractServerTest { duration = 30.seconds, message = "should send publishDiagnostics with empty diagnostics" ) - assertMessage("build/taskFinish", "\"noOp\":true")(debug = true) + assertMessage("build/taskFinish", "\"noOp\":true")() // trigger no-op compilation compile(buildTarget) @@ -537,7 +537,7 @@ class BuildServerTest extends AbstractServerTest { assert(actualResult == expectedResult) } - test("buildTarget/compile: twirl diagnostics (sourcePositionMappers)") { + ignore("buildTarget/compile: twirl diagnostics (sourcePositionMappers)") { val buildTarget = buildTargetUri("twirlProj", "Compile") val testFile = new File(svr.baseDirectory, s"twirlProj/src/main/twirl/main.scala.html")