From 083303266ea779f5c66f7d611ed7317fa1f69018 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Wed, 21 Jul 2021 09:07:50 +0200 Subject: [PATCH] Test Akka Discovery with Scala 3 (#30410) --- .travis.yml | 2 +- .../src/test/scala/akka/io/dns/DockerBindDnsService.scala | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a8dc348f2..97f7bffad9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ jobs: - stage: scala3 name: scala3 # separate job since only a few modules compile with Scala 3 yet - script: jabba install adopt@1.11-0 && jabba use adopt@1.11-0 && sbt -Dakka.build.scalaVersion=3.0 "akka-actor-tests/test:compile" akka-actor-testkit-typed/compile akka-actor-typed/compile akka-discovery/compile akka-pki/test:compile akka-protobuf/test:compile akka-protobuf-v3/test:compile akka-slf4j/test:compile akka-stream/compile akka-stream-tests-tck/test akka-coordination/test akka-serialization-jackson/test:compile akka-testkit/test akka-stream-testkit/test + script: jabba install adopt@1.11-0 && jabba use adopt@1.11-0 && sbt -Dakka.build.scalaVersion=3.0 "akka-actor-tests/test:compile" akka-actor-testkit-typed/compile akka-actor-typed/compile akka-discovery/test akka-pki/test:compile akka-protobuf/test:compile akka-protobuf-v3/test:compile akka-slf4j/test:compile akka-stream/compile akka-stream-tests-tck/test akka-coordination/test akka-serialization-jackson/test:compile akka-testkit/test akka-stream-testkit/test stages: - name: whitesource diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/DockerBindDnsService.scala b/akka-actor-tests/src/test/scala/akka/io/dns/DockerBindDnsService.scala index 6e333b1fcf..924cbb4e1a 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/DockerBindDnsService.scala +++ b/akka-actor-tests/src/test/scala/akka/io/dns/DockerBindDnsService.scala @@ -72,7 +72,8 @@ abstract class DockerBindDnsService(config: Config) extends AkkaSpec(config) wit }) val creation = client.createContainer(containerConfig, containerName) - creation.warnings() should be(null).or(have(size(0))) + if (creation.warnings() != null) + creation.warnings() should have(size(0)) id = Some(creation.id()) client.startContainer(creation.id())