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

Merge remote-tracking branch 'origin/release/os/4.5' into vkolomeyko/os-4.5-os-4.6-merge

Browse Source
This commit is contained in:
Viktor Kolomeyko 2020-07-21 10:29:07 +01:00
commit 234ac2c246
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
node/src/test/kotlin/net/corda/node/internal/AbstractNodeTests.kt
View File

@ -6,7 +6,6 @@ import net.corda.core.internal.concurrent.transpose
import net.corda.core.utilities.contextLogger
import net.corda.core.utilities.getOrThrow
import net.corda.nodeapi.internal.persistence.DatabaseConfig
import net.corda.testing.common.internal.relaxedThoroughness
import net.corda.testing.internal.configureDatabase
import net.corda.testing.node.internal.ProcessUtilities.startJavaProcess
import org.junit.Rule
@ -43,8 +42,7 @@ class AbstractNodeTests {
@Test(timeout=300_000)
fun `H2 fix is applied`() {
val pool = Executors.newFixedThreadPool(5)
val runs = if (relaxedThoroughness) 1 else 100
(0 until runs).map {
(0 until 5).map {
// Four "nodes" seems to be the magic number to reproduce the problem on CI:
val urls = (0 until 4).map { freshURL() }
// Haven't been able to reproduce in a warm JVM:

3
testing/test-common/src/main/kotlin/net/corda/testing/common/internal/Thoroughness.kt
View File

@ -1,3 +0,0 @@
package net.corda.testing.common.internal
val relaxedThoroughness = System.getenv("TEAMCITY_PROJECT_NAME") == "Pull Requests"