Merge pull request #88 from p2p-org/timeout-tests-ws

problem: timeout on unit tests
This commit is contained in:
a10zn8
2022-12-16 14:42:09 +04:00
committed by GitHub
2 changed files with 5 additions and 4 deletions

View File

@@ -405,7 +405,8 @@ open class WsConnection(
)
val response = Flux.from(rpcReceive.asFlux())
.doOnSubscribe { sendRpc(request) }
// send the request _after_ WS subscribes to the responses, otherwise the response may come before the actual subscription and be lost
.doOnRequest { sendRpc(request) }
.filter { resp -> resp.id.asNumber() == expectedId }
.take(Defaults.timeout)
.take(1)

View File

@@ -92,7 +92,7 @@ class WsConnectionSpec extends Specification {
it.id.asNumber() == 15L && Global.objectMapper.readValue(it.result, TransactionJson) == tx
}
.expectComplete()
.verify(Duration.ofSeconds(5))
.verify(Duration.ofSeconds(1))
}
def "Makes a RPC call - return null"() {
@@ -115,7 +115,7 @@ class WsConnectionSpec extends Specification {
it.resultAsRawString == 'null'
}
.expectComplete()
.verify(Duration.ofSeconds(5))
.verify(Duration.ofSeconds(1))
}
def "Makes a RPC call - return error"() {
@@ -140,6 +140,6 @@ class WsConnectionSpec extends Specification {
it.error.code == RpcResponseError.CODE_METHOD_NOT_EXIST && it.error.message == "test"
}
.expectComplete()
.verify(Duration.ofSeconds(5))
.verify(Duration.ofSeconds(1))
}
}