ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-19 07:38:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

INFRA-683 Move Corda OS release branch builds to serial (#6703)

Browse Source 
Co-authored-by: Waldemar Zurowski <waldemar.zurowski@r3.com>
This commit is contained in:
Ross Nicoll
2020-09-14 11:29:42 +01:00
committed by GitHub
parent ba802c6619
commit b3d9d1291f
4 changed files with 227 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
node/src/test/kotlin/net/corda/node/services/network/NetworkMapUpdaterTest.kt
View File

@ -43,6 +43,8 @@ import org.junit.*
import rx.schedulers.TestScheduler
import java.io.IOException
import java.net.URL
import java.nio.file.FileSystem
import java.nio.file.Path
import java.security.KeyPair
import java.time.Instant
import java.time.temporal.ChronoUnit
@ -60,11 +62,12 @@ class NetworkMapUpdaterTest {
private val cacheExpiryMs = 1000
private val privateNetUUID = UUID.randomUUID()
private val fs = Jimfs.newFileSystem(unix())
private val baseDir = fs.getPath("/node")
private val nodeInfoDir = baseDir / NODE_INFO_DIRECTORY
private lateinit var fs: FileSystem
private lateinit var baseDir: Path
private val nodeInfoDir
get() = baseDir / NODE_INFO_DIRECTORY
private val scheduler = TestScheduler()
private val fileWatcher = NodeInfoWatcher(baseDir, scheduler)
private lateinit var fileWatcher: NodeInfoWatcher
private val nodeReadyFuture = openFuture<Void?>()
private val networkMapCache = createMockNetworkMapCache()
private lateinit var ourKeyPair: KeyPair
@ -80,6 +83,10 @@ class NetworkMapUpdaterTest {
// register BouncyCastle and EdDSA provider separately, which wrecks havoc.
Crypto.registerProviders()
fs = Jimfs.newFileSystem(unix())
baseDir = fs.getPath("/node")
fileWatcher = NodeInfoWatcher(baseDir, scheduler)
ourKeyPair = Crypto.generateKeyPair(X509Utilities.DEFAULT_TLS_SIGNATURE_SCHEME)
ourNodeInfo = createNodeInfoAndSigned("Our info", ourKeyPair).signed
server = NetworkMapServer(cacheExpiryMs.millis)

2
node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentServiceTest.kt
View File

@ -25,7 +25,6 @@ import net.corda.nodeapi.exceptions.DuplicateAttachmentException
import net.corda.nodeapi.internal.persistence.CordaPersistence
import net.corda.nodeapi.internal.persistence.DatabaseConfig
import net.corda.testing.common.internal.testNetworkParameters
import net.corda.testing.core.internal.ContractJarTestUtils
import net.corda.testing.core.internal.ContractJarTestUtils.makeTestContractJar
import net.corda.testing.core.internal.ContractJarTestUtils.makeTestJar
import net.corda.testing.core.internal.ContractJarTestUtils.makeTestSignedContractJar
@ -96,6 +95,7 @@ class NodeAttachmentServiceTest {
@After
fun tearDown() {
database.close()
fs.close()
}
@Test