exclude tests using DisposableSys from aeron run (#31240)

* Revert "exclude tests using DisposableSys from aeron run (#31230)"

This reverts commit a2a90d6325.

* Revert "re-enable tests using DisposableSys (#30838)"

This reverts commit 93622f56e7.

* remove duplicate tags parameter
This commit is contained in:
Patrik Nordwall 2022-03-14 07:52:20 +01:00 committed by GitHub
parent 79718a068d
commit 9f7f7027f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions

View file

@ -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()
}
}

View file

@ -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()
}
}