Skip to content
This repository was archived by the owner on Aug 2, 2022. It is now read-only.

Commit 2dbe660

Browse files
skip RefreshSearchAnalyzerActionIT for Infra IT (#315)
* address comment some writting changes just for consistency with AES side
1 parent 76bd1fd commit 2dbe660

File tree

5 files changed

+17
-5
lines changed

5 files changed

+17
-5
lines changed

src/main/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/step/forcemerge/AttemptSetReadOnlyStep.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ class AttemptSetReadOnlyStep(
6161
try {
6262
val updateSettingsRequest = UpdateSettingsRequest()
6363
.indices(indexName)
64-
.settings(
65-
Settings.builder().put(SETTING_BLOCKS_WRITE, true)
66-
)
64+
.settings(Settings.builder().put(SETTING_BLOCKS_WRITE, true))
6765
val response: AcknowledgedResponse = client.admin().indices()
6866
.suspendUntil { updateSettings(updateSettingsRequest, it) }
6967

src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/IndexManagementIndicesIT.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,4 +135,4 @@ class IndexManagementIndicesIT : IndexStateManagementRestTestCase() {
135135

136136
waitFor { assertEquals(newPolicy.id, getManagedIndexConfig(index)?.changePolicy?.policyID) }
137137
}
138-
}
138+
}

src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/IndexManagementRestTestCase.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ import org.elasticsearch.test.rest.ESRestTestCase
2121

2222
abstract class IndexManagementRestTestCase : ESRestTestCase() {
2323

24+
protected val isLocalTest = clusterName() == "integTest"
25+
private fun clusterName(): String {
26+
return System.getProperty("tests.clustername")
27+
}
28+
2429
fun Response.asMap(): Map<String, Any> = entityAsMap(this)
2530

2631
protected fun Response.restStatus(): RestStatus = RestStatus.fromCode(this.statusLine.statusCode)

src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/indexstatemanagement/runner/ManagedIndexRunnerIT.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ class ManagedIndexRunnerIT : IndexStateManagementRestTestCase() {
9999

100100
val managedIndexConfig = getExistingManagedIndexConfig(indexName)
101101

102-
assertEquals("Created managed index did not default to 5 minutes", 5, (managedIndexConfig.jobSchedule as IntervalSchedule).interval)
102+
assertEquals("Created managed index did not default to ${ManagedIndexSettings.DEFAULT_JOB_INTERVAL}minutes",
103+
ManagedIndexSettings.DEFAULT_JOB_INTERVAL, (managedIndexConfig.jobSchedule as IntervalSchedule).interval)
103104

104105
// init policy
105106
updateManagedIndexConfigStartTime(managedIndexConfig)

src/test/kotlin/com/amazon/opendistroforelasticsearch/indexmanagement/refreshanalyzer/RefreshSearchAnalyzerActionIT.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,20 @@ import org.elasticsearch.client.Request
2121
import org.elasticsearch.common.io.Streams
2222
import org.elasticsearch.common.settings.Settings
2323
import org.elasticsearch.common.xcontent.XContentType
24+
import org.junit.Assume
25+
import org.junit.Before
2426
import java.io.InputStreamReader
2527
import java.nio.charset.Charset
2628
import java.nio.charset.StandardCharsets
2729
import java.nio.file.Files
2830

2931
class RefreshSearchAnalyzerActionIT : IndexManagementRestTestCase() {
32+
33+
@Before
34+
fun checkIfLocalCluster() {
35+
Assume.assumeTrue(isLocalTest)
36+
}
37+
3038
fun `test index time analyzer`() {
3139
val buildDir = System.getProperty("buildDir")
3240
val numNodes = System.getProperty("cluster.number_of_nodes", "1").toInt()

0 commit comments

Comments
 (0)