raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Clean up old docker containers at start of a docker test

Browse source 
Fixes #26203
This commit is contained in:
Christopher Batey 2019-02-12 08:06:52 +00:00
parent 8e2d378228
commit 9029ae77ac
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
akka-actor-tests/src/test/scala/akka/io/dns/DockerBindDnsService.scala
View file

@ -7,7 +7,7 @@ package akka.io.dns
import collection.JavaConverters._
import akka.testkit.AkkaSpec
import com.spotify.docker.client.DefaultDockerClient
import com.spotify.docker.client.DockerClient.LogsParam
import com.spotify.docker.client.DockerClient.{ ListContainersParam, LogsParam }
import com.spotify.docker.client.messages.{ ContainerConfig, HostConfig, PortBinding }
import org.scalatest.concurrent.Eventually
@ -53,7 +53,15 @@ trait DockerBindDnsService extends Eventually { self: AkkaSpec ⇒
)
.build()
val creation = client.createContainer(containerConfig, "akka-test-dns-" + getClass.getCanonicalName)
val containerName = "akka-test-dns-" + getClass.getCanonicalName
client.listContainers().asScala.filter(_.names().contains(containerName))
.foreach(c ⇒ {
log.debug("Removing container id: {} from previous test run", c.id())
client.removeContainer(c.id())
})
val creation = client.createContainer(containerConfig, containerName)
creation.warnings() should be(null)
id = Some(creation.id())