Skip to content

Commit c2e9d13

Browse files
authored
Default include_type_name to false in the yml test harness. (#38058)
This PR removes the temporary change we made to the yml test harness in #37285 to automatically set `include_type_name` to `true` in index creation requests if it's not already specified. This is possible now that the vast majority of index creation requests were updated to be typeless in #37611. A few additional tests also needed updating here. Additionally, this PR updates the test harness to set `include_type_name` to `false` in index creation requests when communicating with 6.x nodes. This mirrors the logic added in #37611 to allow for typeless document write requests in test set-up code. With this update in place, we can remove many references to `include_type_name: false` from the yml tests.
1 parent 9350da9 commit c2e9d13

File tree

203 files changed

+515
-740
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+515
-740
lines changed

modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/20_empty_bucket.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"Empty Bucket Aggregation":
33
- do:
44
indices.create:
5-
include_type_name: false
65
index: empty_bucket_idx
76
body:
87
settings:

modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/30_single_value_field.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ setup:
33

44
- do:
55
indices.create:
6-
include_type_name: false
76
index: test
87
body:
98
settings:

modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/40_multi_value_field.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ setup:
33

44
- do:
55
indices.create:
6-
include_type_name: false
76
index: test
87
body:
98
settings:

modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_analyze.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
- do:
2525
indices.create:
26-
include_type_name: false
2726
index: test_deprecated_htmlstrip
2827
body:
2928
settings:

modules/analysis-common/src/test/resources/rest-api-spec/test/indices/validate_query/10_synonyms.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"validate query with synonyms":
33
- do:
44
indices.create:
5-
include_type_name: false
65
index: test
76
body:
87
settings:

modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/10_match.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
# versions in the same position.
66
- do:
77
indices.create:
8-
include_type_name: false
98
index: test
109
body:
1110
settings:

modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/20_ngram_search.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"ngram search":
22
- do:
33
indices.create:
4-
include_type_name: false
54
index: test
65
body:
76
settings:
@@ -44,7 +43,6 @@
4443
"testNGramCopyField":
4544
- do:
4645
indices.create:
47-
include_type_name: false
4846
index: test
4947
body:
5048
settings:

modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/30_ngram_highligthing.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"ngram highlighting":
22
- do:
33
indices.create:
4-
include_type_name: false
54
index: test
65
body:
76
settings:

modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/40_query_string.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"Test query string with snowball":
33
- do:
44
indices.create:
5-
include_type_name: false
65
index: test
76
body:
87
mappings:

modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/50_queries_with_synonyms.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"Test common terms query with stacked tokens":
33
- do:
44
indices.create:
5-
include_type_name: false
65
index: test
76
body:
87
settings:
@@ -220,7 +219,6 @@
220219
"Test match query with synonyms - see #3881 for extensive description of the issue":
221220
- do:
222221
indices.create:
223-
include_type_name: false
224222
index: test
225223
body:
226224
settings:

0 commit comments

Comments
 (0)