From 2e90e2d5f2bd27e96d9e39afb71be8756e80f063 Mon Sep 17 00:00:00 2001 From: Riya Saxena Date: Tue, 18 Jun 2024 17:12:21 -0700 Subject: [PATCH 1/2] fix integ test failures in jenkins infra Signed-off-by: Riya Saxena --- .../alerting/transport/GetRemoteIndexesActionIT.kt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/transport/GetRemoteIndexesActionIT.kt b/alerting/src/test/kotlin/org/opensearch/alerting/transport/GetRemoteIndexesActionIT.kt index 0b9282d10..4fbb9d52e 100644 --- a/alerting/src/test/kotlin/org/opensearch/alerting/transport/GetRemoteIndexesActionIT.kt +++ b/alerting/src/test/kotlin/org/opensearch/alerting/transport/GetRemoteIndexesActionIT.kt @@ -102,8 +102,6 @@ class GetRemoteIndexesActionIT : AlertingRestTestCase() { assertNotNull(clusterDetails[ClusterIndexes.INDEXES_FIELD]) val indexes = clusterDetails[ClusterIndexes.INDEXES_FIELD] as Map> - // Skipping this assert when security is enabled as it doesn't consider the existence of system indexes. - if (!securityEnabled()) assertEquals(expectedNames.size, indexes.keys.size) // Validate index-level response details expectedNames.forEach { indexName -> @@ -152,8 +150,6 @@ class GetRemoteIndexesActionIT : AlertingRestTestCase() { assertNotNull(clusterDetails[ClusterIndexes.INDEXES_FIELD]) val indexes = clusterDetails[ClusterIndexes.INDEXES_FIELD] as Map> - // Skipping this assert when security is enabled as it doesn't consider the existence of system indexes. - if (!securityEnabled()) assertEquals(expectedNames.size, indexes.keys.size) // Validate index-level response details expectedNames.forEach { indexName -> @@ -201,8 +197,6 @@ class GetRemoteIndexesActionIT : AlertingRestTestCase() { assertNotNull(clusterDetails[ClusterIndexes.INDEXES_FIELD]) val indexes = clusterDetails[ClusterIndexes.INDEXES_FIELD] as Map> - // Skipping this assert when security is enabled as it doesn't consider the existence of system indexes. - if (!securityEnabled()) assertEquals(expectedNames.size, indexes.keys.size) // Validate index-level response details expectedNames.forEach { indexName -> From b863f5faef74112c8b20b37a0028eb5122e287cb Mon Sep 17 00:00:00 2001 From: Riya Saxena Date: Tue, 18 Jun 2024 17:23:14 -0700 Subject: [PATCH 2/2] fix integ test failures in jenkins infra Signed-off-by: Riya Saxena --- .../opensearch/alerting/transport/GetRemoteIndexesActionIT.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/transport/GetRemoteIndexesActionIT.kt b/alerting/src/test/kotlin/org/opensearch/alerting/transport/GetRemoteIndexesActionIT.kt index 4fbb9d52e..83e24332e 100644 --- a/alerting/src/test/kotlin/org/opensearch/alerting/transport/GetRemoteIndexesActionIT.kt +++ b/alerting/src/test/kotlin/org/opensearch/alerting/transport/GetRemoteIndexesActionIT.kt @@ -102,7 +102,6 @@ class GetRemoteIndexesActionIT : AlertingRestTestCase() { assertNotNull(clusterDetails[ClusterIndexes.INDEXES_FIELD]) val indexes = clusterDetails[ClusterIndexes.INDEXES_FIELD] as Map> - // Validate index-level response details expectedNames.forEach { indexName -> assertNotNull(indexes[indexName]) @@ -150,7 +149,6 @@ class GetRemoteIndexesActionIT : AlertingRestTestCase() { assertNotNull(clusterDetails[ClusterIndexes.INDEXES_FIELD]) val indexes = clusterDetails[ClusterIndexes.INDEXES_FIELD] as Map> - // Validate index-level response details expectedNames.forEach { indexName -> assertNotNull(indexes[indexName])