From 9f7f7027f6f8f15c51039e6bb8ca71cf4a2a9d4f Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Mon, 14 Mar 2022 07:52:20 +0100 Subject: [PATCH] exclude tests using DisposableSys from aeron run (#31240) * Revert "exclude tests using DisposableSys from aeron run (#31230)" This reverts commit a2a90d63251360b2acd1f56e06fc444b8d8d3802. * Revert "re-enable tests using DisposableSys (#30838)" This reverts commit 93622f56e7d76919c45696e7592669727d184d54. * remove duplicate tags parameter --- .../sbr/RandomizedBrainResolverIntegrationSpec.scala | 9 +++++++-- .../cluster/sbr/SplitBrainResolverIntegrationSpec.scala | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/RandomizedBrainResolverIntegrationSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/RandomizedBrainResolverIntegrationSpec.scala index bce6cc7200..225e85caa6 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/RandomizedBrainResolverIntegrationSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/RandomizedBrainResolverIntegrationSpec.scala @@ -24,7 +24,6 @@ import akka.pattern.ask import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec -import akka.testkit.GHExcludeAeronTest import akka.testkit.ImplicitSender import akka.testkit.LongRunningTest import akka.testkit.TestKit @@ -405,7 +404,13 @@ class RandomizedSplitBrainResolverIntegrationSpec "SplitBrainResolver with lease" must { for (scenario <- scenarios) { - scenario.toString.taggedAs(LongRunningTest, GHExcludeAeronTest) in { + scenario.toString taggedAs (LongRunningTest) in { + // temporarily disabled for aeron-udp in multi-node: https://github.com/akka/akka/pull/30706/ + val arteryConfig = system.settings.config.getConfig("akka.remote.artery") + if (arteryConfig.getInt("canonical.port") == 6000 && + arteryConfig.getString("transport") == "aeron-udp") { + pending + } DisposableSys(scenario).verify() } } diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/SplitBrainResolverIntegrationSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/SplitBrainResolverIntegrationSpec.scala index 5706a270ce..a11df3908f 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/SplitBrainResolverIntegrationSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sbr/SplitBrainResolverIntegrationSpec.scala @@ -27,7 +27,6 @@ import akka.pattern.ask import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec -import akka.testkit.GHExcludeAeronTest import akka.testkit.ImplicitSender import akka.testkit.LongRunningTest import akka.testkit.TestKit @@ -458,7 +457,13 @@ class SplitBrainResolverIntegrationSpec "Cluster SplitBrainResolver" must { for (scenario <- scenarios) { - scenario.toString.taggedAs(LongRunningTest, GHExcludeAeronTest) in { + scenario.toString taggedAs LongRunningTest in { + // temporarily disabled for aeron-udp in multi-node: https://github.com/akka/akka/pull/30706/ + val arteryConfig = system.settings.config.getConfig("akka.remote.artery") + if (arteryConfig.getInt("canonical.port") == 6000 && + arteryConfig.getString("transport") == "aeron-udp") { + pending + } DisposableSys(scenario).verify() } }