Skip to content

Commit 930a99c

Browse files
authored
Fix and unmute synonyms tests using timeout (elastic#117486)
1 parent 5a6464c commit 930a99c

11 files changed

+46
-15
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,6 @@ tests:
185185
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
186186
method: test {p0=snapshot/20_operator_privileges_disabled/Operator only settings can be set and restored by non-operator user when operator privileges is disabled}
187187
issue: https://github.com/elastic/elasticsearch/issues/116775
188-
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
189-
method: test {p0=synonyms/90_synonyms_reloading_for_synset/Reload analyzers for specific synonym set}
190-
issue: https://github.com/elastic/elasticsearch/issues/116777
191188
- class: org.elasticsearch.xpack.searchablesnapshots.hdfs.SecureHdfsSearchableSnapshotsIT
192189
issue: https://github.com/elastic/elasticsearch/issues/116851
193190
- class: org.elasticsearch.search.basic.SearchWithRandomIOExceptionsIT

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ setup:
1717

1818
- do:
1919
cluster.health:
20-
wait_for_no_initializing_shards: true
20+
index: .synonyms-2
21+
timeout: 2s
22+
wait_for_status: green
23+
ignore: 408
2124

2225
- do:
2326
synonyms.get_synonym:
@@ -64,7 +67,10 @@ setup:
6467

6568
- do:
6669
cluster.health:
67-
wait_for_no_initializing_shards: true
70+
index: .synonyms-2
71+
timeout: 2s
72+
wait_for_status: green
73+
ignore: 408
6874

6975
- do:
7076
synonyms.get_synonym:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ setup:
1414
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
1515
- do:
1616
cluster.health:
17-
wait_for_no_initializing_shards: true
17+
index: .synonyms-2
18+
timeout: 2s
19+
wait_for_status: green
20+
ignore: 408
1821

1922
- do:
2023
indices.create:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ setup:
1717
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
1818
- do:
1919
cluster.health:
20-
wait_for_no_initializing_shards: true
20+
index: .synonyms-2
21+
timeout: 2s
22+
wait_for_status: green
23+
ignore: 408
2124

2225
---
2326
"Get synonyms set":

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ setup:
1515
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
1616
- do:
1717
cluster.health:
18-
wait_for_no_initializing_shards: true
18+
index: .synonyms-2
19+
timeout: 2s
20+
wait_for_status: green
21+
ignore: 408
22+
1923
---
2024
"Delete synonyms set":
2125
- do:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ setup:
1313
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
1414
- do:
1515
cluster.health:
16-
wait_for_no_initializing_shards: true
16+
index: .synonyms-2
17+
timeout: 2s
18+
wait_for_status: green
19+
ignore: 408
1720

1821
- do:
1922
synonyms.put_synonym:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ setup:
1717
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
1818
- do:
1919
cluster.health:
20-
wait_for_no_initializing_shards: true
20+
index: .synonyms-2
21+
timeout: 2s
22+
wait_for_status: green
23+
ignore: 408
24+
2125
---
2226
"Update a synonyms rule":
2327
- do:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ setup:
1717
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
1818
- do:
1919
cluster.health:
20-
wait_for_no_initializing_shards: true
21-
20+
index: .synonyms-2
21+
timeout: 2s
22+
wait_for_status: green
23+
ignore: 408
2224

2325
---
2426
"Get a synonym rule":

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ setup:
1717
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
1818
- do:
1919
cluster.health:
20-
wait_for_no_initializing_shards: true
20+
index: .synonyms-2
21+
timeout: 2s
22+
wait_for_status: green
23+
ignore: 408
2124

2225
---
2326
"Delete synonym rule":

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ setup:
1616
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
1717
- do:
1818
cluster.health:
19-
wait_for_no_initializing_shards: true
19+
index: .synonyms-2
20+
timeout: 2s
21+
wait_for_status: green
22+
ignore: 408
2023

2124
# Create an index with synonym_filter that uses that synonyms set
2225
- do:

0 commit comments

Comments
 (0)