Skip to content

Simplify synonyms YAML tests after auto expand replicas changed #120700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 24, 2025
Merged

Simplify synonyms YAML tests after auto expand replicas changed #120700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ setup:

- do:
cluster.health:
index: .synonyms-2
timeout: 2s
index: .synonyms
wait_for_status: green
ignore: 408

- do:
synonyms.get_synonym:
Expand Down Expand Up @@ -67,10 +65,8 @@ setup:

- do:
cluster.health:
index: .synonyms-2
timeout: 2s
index: .synonyms
wait_for_status: green
ignore: 408

- do:
synonyms.get_synonym:
Expand Down
4 changes: 1 addition & 3 deletions ...-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@ setup:
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
index: .synonyms-2
timeout: 2s
index: .synonyms
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not related to this PR, but for my educaiton: what is .synynoms-2? Why we added it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.synonyms-2 is the current version of the index - we changed the index format before releasing it, so it has a -2 suffix to it.

.synonyms is the alias for the system indices. I think it's more correct to refer to the alias instead of the specific index, so in case it changes we don't have to change all the YAML tests.

So, it's unrelated to this change, but I thought we could do some winter cleaning here 🙂

wait_for_status: green
ignore: 408

- do:
indices.create:
Expand Down
4 changes: 1 addition & 3 deletions rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ setup:
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
index: .synonyms-2
timeout: 2s
index: .synonyms
wait_for_status: green
ignore: 408

---
"Get synonyms set":
Expand Down
4 changes: 1 addition & 3 deletions rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@ setup:
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
index: .synonyms-2
timeout: 2s
index: .synonyms
wait_for_status: green
ignore: 408

---
"Delete synonyms set":
Expand Down
4 changes: 1 addition & 3 deletions ...-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ setup:
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
index: .synonyms-2
timeout: 2s
index: .synonyms
wait_for_status: green
ignore: 408

- do:
synonyms.put_synonym:
Expand Down
4 changes: 1 addition & 3 deletions rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ setup:
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
index: .synonyms-2
timeout: 2s
index: .synonyms
wait_for_status: green
ignore: 408

---
"Update a synonyms rule":
Expand Down
4 changes: 1 addition & 3 deletions rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ setup:
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
index: .synonyms-2
timeout: 2s
index: .synonyms
wait_for_status: green
ignore: 408

---
"Get a synonym rule":
Expand Down
4 changes: 1 addition & 3 deletions ...pi-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ setup:
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
index: .synonyms-2
timeout: 2s
index: .synonyms
wait_for_status: green
ignore: 408

---
"Delete synonym rule":
Expand Down
4 changes: 1 addition & 3 deletions ...pi-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ setup:
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
index: .synonyms-2
timeout: 2s
index: .synonyms
wait_for_status: green
ignore: 408

# Create an index with synonym_filter that uses that synonyms set
- do:
Expand Down
4 changes: 1 addition & 3 deletions ...c/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,8 @@ setup:
# This is to ensure that all index shards (write and read) are available. In serverless this can take some time.
- do:
cluster.health:
index: .synonyms-2
timeout: 2s
index: .synonyms
wait_for_status: green
ignore: 408

# Create my_index1 with synonym_filter that uses synonyms_set1
- do:
Expand Down