diff --git a/testing/e2e-test-utilities/src/main/kotlin/net/corda/e2etest/utilities/config/ConfigTestUtils.kt b/testing/e2e-test-utilities/src/main/kotlin/net/corda/e2etest/utilities/config/ConfigTestUtils.kt index ca79cb3885e..c8256f34bc5 100644 --- a/testing/e2e-test-utilities/src/main/kotlin/net/corda/e2etest/utilities/config/ConfigTestUtils.kt +++ b/testing/e2e-test-utilities/src/main/kotlin/net/corda/e2etest/utilities/config/ConfigTestUtils.kt @@ -3,7 +3,6 @@ package net.corda.e2etest.utilities.config import com.fasterxml.jackson.databind.JsonNode import kong.unirest.UnirestException import net.corda.e2etest.utilities.ClusterInfo -import net.corda.e2etest.utilities.ClusterReadinessChecker import net.corda.e2etest.utilities.DEFAULT_CLUSTER import net.corda.e2etest.utilities.assertWithRetryIgnoringExceptions import net.corda.e2etest.utilities.cluster @@ -152,14 +151,15 @@ fun ClusterInfo.waitForConfigurationChange( } } - // check cluster is ready. No need to aggressively poll too much as its expected the cluster to be down for a number of seconds - ClusterReadinessChecker().assertIsReady(Duration.ofMinutes(2), Duration.ofMillis(1000)) - // Wait for the service to become available again and have the expected configuration value assertWithRetryIgnoringExceptions { timeout(timeout) command { getConfig(section) } condition { + if (it.code != OK.statusCode) { + return@condition false + } + val bodyJSON = it.body.toJson() it.code == OK.statusCode && bodyJSON["sourceConfig"] != null && bodyJSON.sourceConfigNode()[key] != null && bodyJSON.sourceConfigNode()[key].toString() == value