From dfff9b77f5b44136e528a98eafa6a700df375037 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 23 May 2024 14:05:02 +0000 Subject: [PATCH 1/2] Update munit to 1.0.0 --- project/deps.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/deps.sc b/project/deps.sc index a253d705e..19602f4be 100644 --- a/project/deps.sc +++ b/project/deps.sc @@ -55,7 +55,7 @@ object Deps { ivy"com.github.plokhotnyuk.jsoniter-scala::jsoniter-scala-macros:${Versions.jsoniterScala}" def jvmRepr = ivy"com.github.jupyter:jvm-repr:0.4.0" def mdoc = ivy"org.scalameta::mdoc:2.5.2" - def munit = ivy"org.scalameta::munit:0.7.29" + def munit = ivy"org.scalameta::munit:1.0.0" def metabrowseServer = ivy"org.scalameta:::metabrowse-server:0.2.12" def osLib = ivy"com.lihaoyi::os-lib:0.10.0" def pprint = ivy"com.lihaoyi::pprint:0.9.0" From 87831063a3995ce8eb1ab74ef207df4d74ce2a97 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 28 May 2024 20:27:14 +0200 Subject: [PATCH 2/2] Increase munit default timeout Seems it's taken into account for non-async tests in munit >= 1.0.0 --- .../examples/src/test/scala/almond/examples/Examples.scala | 3 +++ .../src/main/scala/almond/integration/AlmondFunSuite.scala | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/scala/examples/src/test/scala/almond/examples/Examples.scala b/modules/scala/examples/src/test/scala/almond/examples/Examples.scala index ad05cf2fd..86fcb6e84 100644 --- a/modules/scala/examples/src/test/scala/almond/examples/Examples.scala +++ b/modules/scala/examples/src/test/scala/almond/examples/Examples.scala @@ -2,12 +2,15 @@ package almond.examples import java.nio.charset.Charset +import scala.concurrent.duration.DurationInt import scala.util.Properties class Examples extends munit.FunSuite { def kernelId = "almond-examples" + override def munitTimeout = 5.minutes + lazy val notebooks = os.list(ExampleProperties.directory) .filter(_.last.endsWith(".ipynb")) .filter(os.isFile(_)) diff --git a/modules/scala/integration/src/main/scala/almond/integration/AlmondFunSuite.scala b/modules/scala/integration/src/main/scala/almond/integration/AlmondFunSuite.scala index 66c4e534d..cdb7fff12 100644 --- a/modules/scala/integration/src/main/scala/almond/integration/AlmondFunSuite.scala +++ b/modules/scala/integration/src/main/scala/almond/integration/AlmondFunSuite.scala @@ -4,11 +4,13 @@ import munit.{Location, TestOptions} import java.util.concurrent.atomic.AtomicInteger +import scala.concurrent.duration.DurationInt import scala.util.control.NonFatal abstract class AlmondFunSuite extends munit.FunSuite { - def mightRetry: Boolean = false + def mightRetry: Boolean = false + override def munitTimeout = 5.minutes override def test(options: TestOptions)(body: => Any)(implicit loc: Location): Unit = super.test(options) {