From b30d3c3b1e6df46a62d0bff0d7ff82f1ca916af7 Mon Sep 17 00:00:00 2001 From: Clay Downs <89109232+downsrob@users.noreply.github.com> Date: Fri, 29 Oct 2021 11:28:21 -0700 Subject: [PATCH] Updates testCompile mockito version, adds AwaitsFix annotation to MetadataRegressionIT tests (#168) * Updates testCompile mockito version to match OpenSearch changes * AwaitsFix on the failing MetadataRegressionIT tests Signed-off-by: Robert Downs --- build.gradle | 2 +- .../indexstatemanagement/MetadataRegressionIT.kt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6063fa0a7..06e1046cd 100644 --- a/build.gradle +++ b/build.gradle @@ -173,7 +173,7 @@ dependencies { testCompile "org.opensearch.test:framework:${opensearch_version}" testCompile "org.jetbrains.kotlin:kotlin-test:${kotlin_version}" testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" - testCompile "org.mockito:mockito-core:2.23.0" + testCompile "org.mockito:mockito-core:3.12.4" add("ktlint", "com.pinterest:ktlint:0.41.0") { attributes { diff --git a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/MetadataRegressionIT.kt b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/MetadataRegressionIT.kt index 2910beb10..ed2b15032 100644 --- a/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/MetadataRegressionIT.kt +++ b/src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/MetadataRegressionIT.kt @@ -65,6 +65,7 @@ class MetadataRegressionIT : IndexStateManagementIntegTestCase() { updateClusterSetting(ManagedIndexSettings.METADATA_SERVICE_ENABLED.key, null, false) } + @AwaitsFix(bugUrl = "https://github.com/opensearch-project/index-management/issues/176") fun `test move metadata service`() { updateClusterSetting(ManagedIndexSettings.METADATA_SERVICE_ENABLED.key, "false") updateClusterSetting(ManagedIndexSettings.METADATA_SERVICE_ENABLED.key, "true") @@ -139,6 +140,7 @@ class MetadataRegressionIT : IndexStateManagementIntegTestCase() { } } + @AwaitsFix(bugUrl = "https://github.com/opensearch-project/index-management/issues/176") fun `test job can continue run from cluster state metadata`() { /** * new version of ISM plugin can handle metadata in cluster state @@ -221,6 +223,7 @@ class MetadataRegressionIT : IndexStateManagementIntegTestCase() { } } + @AwaitsFix(bugUrl = "https://github.com/opensearch-project/index-management/issues/176") fun `test new node skip execution when old node exist in cluster`() { Assume.assumeTrue(isMixedNodeRegressionTest)