From 1a57882f45bb6d5555318061696c020126f67e16 Mon Sep 17 00:00:00 2001 From: 47erbot Date: Fri, 10 Dec 2021 05:07:25 +0000 Subject: [PATCH 1/3] Update docker-testkit-core, ... to 0.11.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 9600c52..bfafe43 100644 --- a/build.sbt +++ b/build.sbt @@ -11,7 +11,7 @@ testFrameworks += new TestFramework("munit.Framework") fork in Test := true val munit = "org.scalameta" %% "munit" % "[0.2.0,)" % Provided // scala-steward:off -val testKitVersion = "0.9.9" +val testKitVersion = "0.11.0" libraryDependencies += munit From c67db4101fcd86dc10bfae016e2b4d8e411dc999 Mon Sep 17 00:00:00 2001 From: James Santucci Date: Fri, 21 Jan 2022 12:08:33 -0600 Subject: [PATCH 2/3] Select a 0.11.0 version that actually exists --- build.sbt | 2 +- .../scala/docker/munit/DependencyGraphReadyCheckSpec.scala | 6 +++--- .../scala/docker/munit/DockerContainerLinkingSpec.scala | 6 ++++++ src/test/scala/docker/munit/ElasticsearchServiceSpec.scala | 5 +++++ src/test/scala/docker/munit/MongodbServiceSpec.scala | 5 +++++ 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index cd98599..eddd66e 100644 --- a/build.sbt +++ b/build.sbt @@ -11,7 +11,7 @@ testFrameworks += new TestFramework("munit.Framework") fork in Test := true val munit = "org.scalameta" %% "munit" % "[0.2.0,)" % Provided // scala-steward:off -val testKitVersion = "0.11.0" +val testKitVersion = "0.11.0-beta1" libraryDependencies += munit diff --git a/src/test/scala/docker/munit/DependencyGraphReadyCheckSpec.scala b/src/test/scala/docker/munit/DependencyGraphReadyCheckSpec.scala index c600609..f31d102 100644 --- a/src/test/scala/docker/munit/DependencyGraphReadyCheckSpec.scala +++ b/src/test/scala/docker/munit/DependencyGraphReadyCheckSpec.scala @@ -80,16 +80,16 @@ class DependencyGraphReadyCheckSpec extends FunSuite with DockerKitSpotify { } catch { case e: RuntimeException => log.error("Test failed during readychecks", e) } finally { - Await.ready(containerManager.stopRmAll(), StopContainersTimeout) + Await.ready(containerManager.stopRmAll(StopContainersTimeout), StopContainersTimeout) () } } override def startAllOrFail(): Unit = { - Await.result(containerManager.pullImages(), PullImagesTimeout) + Await.result(containerManager.pullImages(PullImagesTimeout), PullImagesTimeout) containerManager.initReadyAll(StartContainersTimeout).map(_.map(_._2).forall(identity)) sys.addShutdownHook { - containerManager.stopRmAll() + containerManager.stopRmAll(StopContainersTimeout) () } () diff --git a/src/test/scala/docker/munit/DockerContainerLinkingSpec.scala b/src/test/scala/docker/munit/DockerContainerLinkingSpec.scala index 544cb8f..13373c4 100644 --- a/src/test/scala/docker/munit/DockerContainerLinkingSpec.scala +++ b/src/test/scala/docker/munit/DockerContainerLinkingSpec.scala @@ -21,6 +21,9 @@ import com.whisk.docker.impl.dockerjava._ import com.whisk.docker.impl.spotify._ import _root_.munit.FunSuite +import scala.concurrent.duration._ +import scala.language.postfixOps + abstract class DockerContainerLinkingSpec extends FunSuite with DockerTestKit { lazy val cmdExecutor = implicitly[DockerCommandExecutor] @@ -37,6 +40,9 @@ abstract class DockerContainerLinkingSpec extends FunSuite with DockerTestKit { override def dockerContainers = pingService :: pongService :: super.dockerContainers test("A DockerContainer should be linked to the specified containers upon start") { + + implicit val InspectTimeout = 3 seconds + val ping = cmdExecutor.inspectContainer(pingName) val pongPing = cmdExecutor.inspectContainer(s"$pongName/$pingAlias") diff --git a/src/test/scala/docker/munit/ElasticsearchServiceSpec.scala b/src/test/scala/docker/munit/ElasticsearchServiceSpec.scala index 6a5297e..381cc1b 100644 --- a/src/test/scala/docker/munit/ElasticsearchServiceSpec.scala +++ b/src/test/scala/docker/munit/ElasticsearchServiceSpec.scala @@ -20,6 +20,9 @@ import com.whisk.docker._ import com.whisk.docker.impl.dockerjava.DockerKitDockerJava import _root_.munit.FunSuite +import scala.concurrent.duration._ +import scala.language.postfixOps + class ElasticsearchServiceSpec extends FunSuite with DockerElasticsearchService @@ -27,6 +30,8 @@ class ElasticsearchServiceSpec with DockerKitDockerJava { test("elasticsearch container should be ready") { + implicit val ContainerReadyTimeout = 3 seconds + isContainerReady(elasticsearchContainer).map(assert(_)) elasticsearchContainer.getPorts().map(m => assert(m.get(9300).nonEmpty)) elasticsearchContainer.getIpAddresses().map(s => assert(s.nonEmpty)) diff --git a/src/test/scala/docker/munit/MongodbServiceSpec.scala b/src/test/scala/docker/munit/MongodbServiceSpec.scala index 5c5a73c..d449b74 100644 --- a/src/test/scala/docker/munit/MongodbServiceSpec.scala +++ b/src/test/scala/docker/munit/MongodbServiceSpec.scala @@ -20,6 +20,9 @@ import com.whisk.docker._ import com.whisk.docker.impl.spotify.DockerKitSpotify import _root_.munit.FunSuite +import scala.concurrent.duration._ +import scala.language.postfixOps + class MongodbServiceSpec extends FunSuite with DockerTestKit @@ -27,6 +30,8 @@ class MongodbServiceSpec with DockerMongodbService { test("mongodb node should be ready with log line checker") { + implicit val ContainerReadyTimeout = 3 seconds + isContainerReady(mongodbContainer).map(assert(_)) mongodbContainer.getPorts().map(m => assert(m.get(27017).nonEmpty)) mongodbContainer.getIpAddresses().map(s => assert(s.nonEmpty)) From c0d4efaa6966b0c6a5a64c4128346efd0c7d2aa3 Mon Sep 17 00:00:00 2001 From: James Santucci Date: Fri, 21 Jan 2022 13:25:49 -0600 Subject: [PATCH 3/3] upgrade munit to transitively included version there's a symbol missing from the classpath which always points to bin compat SO I ran unused/undeclared compile deps from sbt-explicit-dependencies and found this had been upgraded by the other dep upgrade --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index eddd66e..1e6fbf2 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ name := "docker-testkit-munit" testFrameworks += new TestFramework("munit.Framework") fork in Test := true -val munit = "org.scalameta" %% "munit" % "[0.2.0,)" % Provided // scala-steward:off +val munit = "org.scalameta" %% "munit" % "1.0.0-M1" % Provided // scala-steward:off val testKitVersion = "0.11.0-beta1" libraryDependencies += munit