From e2a3e7e7994147336edc352b7ce8f5b764224335 Mon Sep 17 00:00:00 2001 From: Liam Thompson Date: Wed, 18 Dec 2024 11:07:31 +0100 Subject: [PATCH 1/4] [DOCS] Fix failing docs test --- docs/reference/indices/shard-stores.asciidoc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/reference/indices/shard-stores.asciidoc b/docs/reference/indices/shard-stores.asciidoc index 04b086a758f9d..a336cd20ae360 100644 --- a/docs/reference/indices/shard-stores.asciidoc +++ b/docs/reference/indices/shard-stores.asciidoc @@ -193,12 +193,9 @@ The API returns the following response: // TESTRESPONSE[s/"attributes": \{[^}]*\}/"attributes": $body.$_path/] // TESTRESPONSE[s/"roles": \[[^]]*\]/"roles": $body.$_path/] // TESTRESPONSE[s/"8.10.0"/\$node_version/] -// TESTRESPONSE[s/"min_index_version": 7000099/"min_index_version": $body.$_path/] -// TESTRESPONSE[s/"min_index_version": 7000099/"min_index_version": $body.$_path/] -// TESTRESPONSE[s/"max_index_version": 8100099/"max_index_version": $body.$_path/] - - - +// TESTRESPONSE[s/"min_index_version": 8000099/"min_index_version": $body.$_path/] +// TESTRESPONSE[s/"min_read_only_index_version": 7000099/"min_read_only_index_version": $body.$_path/] +// TESTRESPONSE[s/"max_index_version": 9004000/"max_index_version": $body.$_path/] <1> The key is the corresponding shard id for the store information <2> A list of store information for all copies of the shard <3> The node information that hosts a copy of the store, the key From 3c690a1f26ce2f6f1a4845bd33df1c7f5f4fbeeb Mon Sep 17 00:00:00 2001 From: Liam Thompson Date: Wed, 29 Jan 2025 14:45:25 +0100 Subject: [PATCH 2/4] Unmute test --- muted-tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index f1c41252421a9..95db24bda559c 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -154,9 +154,6 @@ tests: - class: org.elasticsearch.xpack.ccr.rest.ShardChangesRestIT method: testShardChangesNoOperation issue: https://github.com/elastic/elasticsearch/issues/118800 -- class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT - method: test {yaml=reference/indices/shard-stores/line_150} - issue: https://github.com/elastic/elasticsearch/issues/118896 - class: org.elasticsearch.cluster.service.MasterServiceTests method: testThreadContext issue: https://github.com/elastic/elasticsearch/issues/118914 From cdf02eebd60c59879ed64078575d0e4d7d04ed9f Mon Sep 17 00:00:00 2001 From: Liam Thompson Date: Wed, 29 Jan 2025 15:40:00 +0100 Subject: [PATCH 3/4] Replace hardcoded values with regex in snippet test --- docs/reference/indices/shard-stores.asciidoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/reference/indices/shard-stores.asciidoc b/docs/reference/indices/shard-stores.asciidoc index 3286393f44df3..adb05d0340901 100644 --- a/docs/reference/indices/shard-stores.asciidoc +++ b/docs/reference/indices/shard-stores.asciidoc @@ -198,9 +198,9 @@ The API returns the following response: // TESTRESPONSE[s/"attributes": \{[^}]*\}/"attributes": $body.$_path/] // TESTRESPONSE[s/"roles": \[[^]]*\]/"roles": $body.$_path/] // TESTRESPONSE[s/"8.10.0"/\$node_version/] -// TESTRESPONSE[s/"min_index_version": 8000099/"min_index_version": $body.$_path/] -// TESTRESPONSE[s/"min_read_only_index_version": 7000099/"min_read_only_index_version": $body.$_path/] -// TESTRESPONSE[s/"max_index_version": 9004000/"max_index_version": $body.$_path/] +// TESTRESPONSE[s/"min_index_version": [0-9]+/"min_index_version": $body.$_path/] +// TESTRESPONSE[s/"min_read_only_index_version": [0-9]+/"min_read_only_index_version": $body.$_path/] +// TESTRESPONSE[s/"max_index_version": [0-9]+/"max_index_version": $body.$_path/] <1> The key is the corresponding shard id for the store information <2> A list of store information for all copies of the shard From 083edb3aca5f72219ee8ebbb7226517f4793c467 Mon Sep 17 00:00:00 2001 From: Liam Thompson <32779855+leemthompo@users.noreply.github.com> Date: Wed, 29 Jan 2025 18:10:54 +0100 Subject: [PATCH 4/4] Delete superfluous line --- docs/reference/indices/shard-stores.asciidoc | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/reference/indices/shard-stores.asciidoc b/docs/reference/indices/shard-stores.asciidoc index adb05d0340901..941c1ce379078 100644 --- a/docs/reference/indices/shard-stores.asciidoc +++ b/docs/reference/indices/shard-stores.asciidoc @@ -199,7 +199,6 @@ The API returns the following response: // TESTRESPONSE[s/"roles": \[[^]]*\]/"roles": $body.$_path/] // TESTRESPONSE[s/"8.10.0"/\$node_version/] // TESTRESPONSE[s/"min_index_version": [0-9]+/"min_index_version": $body.$_path/] -// TESTRESPONSE[s/"min_read_only_index_version": [0-9]+/"min_read_only_index_version": $body.$_path/] // TESTRESPONSE[s/"max_index_version": [0-9]+/"max_index_version": $body.$_path/] <1> The key is the corresponding shard id for the store information