bugfix: Try to fix Mill flaky test

Looks like Mill will sometimes throw an exception which is forwarded to Metals and causes tests to hange, this should make the tests stop hanging and make retries work.
scalameta · Sep 29, 2023 · 9417374 · 9417374
1 parent b511ce9
commit 9417374
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/tests/slow/src/test/scala/tests/mill/MillServerCodeLensSuite.scala b/tests/slow/src/test/scala/tests/mill/MillServerCodeLensSuite.scala
@@ -12,8 +12,6 @@ import tests.MillServerInitializer
 class MillServerCodeLensSuite
     extends BaseCodeLensLspSuite("mill-server-lenses", MillServerInitializer) {
 
-  override def munitTimeout: Duration = Duration("4min")
-
   test("run-mill-lens", maxRetry = 3) {
     cleanWorkspace()
     writeLayout(

diff --git a/tests/unit/src/main/scala/tests/TestingServer.scala b/tests/unit/src/main/scala/tests/TestingServer.scala
@@ -1034,6 +1034,7 @@ final case class TestingServer(
       filename: String,
       maxRetries: Int = 4,
   ): Future[List[l.CodeLens]] = {
+    Debug.printEnclosing(filename)
     val path = toPath(filename)
     val uri = path.toURI.toString
     val params = new CodeLensParams(new TextDocumentIdentifier(uri))
@@ -1050,7 +1051,12 @@ final case class TestingServer(
     val handler = { refreshCount: Int =>
       if (refreshCount > 0)
         for {
-          lenses <- fullServer.codeLens(params).asScala.map(_.asScala)
+          lenses <- fullServer
+            .codeLens(params)
+            .asScala
+            .map(_.asScala)
+            .withTimeout(10, TimeUnit.SECONDS)
+            .recover(_ => Nil)
         } {
           if (lenses.nonEmpty) codeLenses.trySuccess(lenses.toList)
           else if (retries > 0) {