ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-18 20:47:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ENT-11522: Unignored flow tests and updated artemis mq filter to check for null property. (#7679)

Browse Source
This commit is contained in:
Adel El-Beik 2024-03-04 12:25:37 +00:00 committed by GitHub
parent 4031c28947
commit 6dfbed572e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node/src/integration-test/kotlin/net/corda/node/flows/FlowSessionCloseTest.kt
View File

@ -26,12 +26,10 @@ import net.corda.testing.driver.driver
import net.corda.testing.node.User import net.corda.testing.node.User
import net.corda.testing.node.internal.enclosedCordapp import net.corda.testing.node.internal.enclosedCordapp
import org.assertj.core.api.Assertions.assertThatThrownBy import org.assertj.core.api.Assertions.assertThatThrownBy
import org.junit.Ignore
import org.junit.Test import org.junit.Test
import java.sql.SQLTransientConnectionException import java.sql.SQLTransientConnectionException
import kotlin.test.assertEquals import kotlin.test.assertEquals
@Ignore("TODO JDK17: Fixme")
class FlowSessionCloseTest { class FlowSessionCloseTest {
private val user = User("user", "pwd", setOf(Permissions.all())) private val user = User("user", "pwd", setOf(Permissions.all()))

2
node/src/integration-test/kotlin/net/corda/node/flows/FlowWithClientIdTest.kt
View File

@ -38,7 +38,6 @@ import net.corda.testing.node.internal.enclosedCordapp
import org.assertj.core.api.Assertions import org.assertj.core.api.Assertions
import org.assertj.core.api.Assertions.assertThatExceptionOfType import org.assertj.core.api.Assertions.assertThatExceptionOfType
import org.junit.Before import org.junit.Before
import org.junit.Ignore
import org.junit.Test import org.junit.Test
import rx.Observable import rx.Observable
import java.time.Duration import java.time.Duration
@ -55,7 +54,6 @@ import kotlin.test.assertNotEquals
import kotlin.test.assertNull import kotlin.test.assertNull
import kotlin.test.assertTrue import kotlin.test.assertTrue
@Ignore("TODO JDK17: Fixme")
class FlowWithClientIdTest { class FlowWithClientIdTest {
@Before @Before

2
node/src/integration-test/kotlin/net/corda/node/modes/draining/FlowsDrainingModeContentionTest.kt
View File

@ -29,7 +29,6 @@ import net.corda.testing.node.User
import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThat
import org.junit.After import org.junit.After
import org.junit.Before import org.junit.Before
import org.junit.Ignore
import org.junit.Test import org.junit.Test
import java.util.concurrent.Executors import java.util.concurrent.Executors
import java.util.concurrent.ScheduledExecutorService import java.util.concurrent.ScheduledExecutorService
@ -52,7 +51,6 @@ class FlowsDrainingModeContentionTest {
} }
@Test(timeout=300_000) @Test(timeout=300_000)
@Ignore("TODO JDK17:Fixme - timed out")
fun `draining mode does not deadlock with acks between 2 nodes`() { fun `draining mode does not deadlock with acks between 2 nodes`() {
val message = "Ground control to Major Tom" val message = "Ground control to Major Tom"
driver(DriverParameters( driver(DriverParameters(

2
node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
View File

@ -23,7 +23,6 @@ import net.corda.testing.node.internal.waitForShutdown
import org.assertj.core.api.AssertionsForInterfaceTypes.assertThat import org.assertj.core.api.AssertionsForInterfaceTypes.assertThat
import org.junit.After import org.junit.After
import org.junit.Before import org.junit.Before
import org.junit.Ignore
import org.junit.Test import org.junit.Test
import java.util.concurrent.CountDownLatch import java.util.concurrent.CountDownLatch
import java.util.concurrent.Executors import java.util.concurrent.Executors
@ -86,7 +85,6 @@ class P2PFlowsDrainingModeTest {
} }
@Test(timeout=300_000) @Test(timeout=300_000)
@Ignore("TODO JDK17:Fixme - timed out")
fun `terminate node waiting for pending flows`() { fun `terminate node waiting for pending flows`() {
driver(DriverParameters(portAllocation = portAllocation, notarySpecs = emptyList())) { driver(DriverParameters(portAllocation = portAllocation, notarySpecs = emptyList())) {

2
node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
View File

@ -660,7 +660,7 @@ private class P2PMessagingConsumer(
private val metricsRegistry : MetricRegistry) : LifecycleSupport { private val metricsRegistry : MetricRegistry) : LifecycleSupport {
private companion object { private companion object {
private const val initialSessionMessages = "${P2PMessagingHeaders.Type.KEY}<>'${P2PMessagingHeaders.Type.SESSION_INIT_VALUE}'" private const val initialSessionMessages = "${P2PMessagingHeaders.Type.KEY} is null or ${P2PMessagingHeaders.Type.KEY}<>'${P2PMessagingHeaders.Type.SESSION_INIT_VALUE}'"
private val logger by lazy { loggerFor<P2PMessagingClient>() } private val logger by lazy { loggerFor<P2PMessagingClient>() }
} }