Skip to content

Commit 8fc5a50

Browse files
authored
Simplify synonyms YAML tests after auto expand replicas changed (#120700)
1 parent ffe73dc commit 8fc5a50

10 files changed

+11
-33
lines changed

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

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

1818
- do:
1919
cluster.health:
20-
index: .synonyms-2
21-
timeout: 2s
20+
index: .synonyms
2221
wait_for_status: green
23-
ignore: 408
2422

2523
- do:
2624
synonyms.get_synonym:
@@ -67,10 +65,8 @@ setup:
6765

6866
- do:
6967
cluster.health:
70-
index: .synonyms-2
71-
timeout: 2s
68+
index: .synonyms
7269
wait_for_status: green
73-
ignore: 408
7470

7571
- do:
7672
synonyms.get_synonym:

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@ 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-
index: .synonyms-2
18-
timeout: 2s
17+
index: .synonyms
1918
wait_for_status: green
20-
ignore: 408
2119

2220
- do:
2321
indices.create:

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@ 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-
index: .synonyms-2
21-
timeout: 2s
20+
index: .synonyms
2221
wait_for_status: green
23-
ignore: 408
2422

2523
---
2624
"Get synonyms set":

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ 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-
index: .synonyms-2
19-
timeout: 2s
18+
index: .synonyms
2019
wait_for_status: green
21-
ignore: 408
2220

2321
---
2422
"Delete synonyms set":

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@ 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-
index: .synonyms-2
17-
timeout: 2s
16+
index: .synonyms
1817
wait_for_status: green
19-
ignore: 408
2018

2119
- do:
2220
synonyms.put_synonym:

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@ 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-
index: .synonyms-2
21-
timeout: 2s
20+
index: .synonyms
2221
wait_for_status: green
23-
ignore: 408
2422

2523
---
2624
"Update a synonyms rule":

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@ 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-
index: .synonyms-2
21-
timeout: 2s
20+
index: .synonyms
2221
wait_for_status: green
23-
ignore: 408
2422

2523
---
2624
"Get a synonym rule":

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@ 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-
index: .synonyms-2
21-
timeout: 2s
20+
index: .synonyms
2221
wait_for_status: green
23-
ignore: 408
2422

2523
---
2624
"Delete synonym rule":

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ 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-
index: .synonyms-2
20-
timeout: 2s
19+
index: .synonyms
2120
wait_for_status: green
22-
ignore: 408
2321

2422
# Create an index with synonym_filter that uses that synonyms set
2523
- do:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,8 @@ setup:
2828
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
2929
- do:
3030
cluster.health:
31-
index: .synonyms-2
32-
timeout: 2s
31+
index: .synonyms
3332
wait_for_status: green
34-
ignore: 408
3533

3634
# Create my_index1 with synonym_filter that uses synonyms_set1
3735
- do:

0 commit comments

Comments
 (0)