Skip to content

Commit 78ed5b1

Browse files
msfrohdk2k
authored andcommitted
Update skip versions for flat_object tests (opensearch-project#15448)
While fixing a flat_object bug, I noticed that we were skipping all related yamlRestTests on pre-3.0 versions. Since the flat object field type was added in 2.7, that should be the correct skip level for most tests. The bug I fixed is still present in 2.16 and earlier, so the test that covers that fix needs to be skipped pre-2.17. Signed-off-by: Michael Froh <[email protected]>
1 parent 2d86fb0 commit 78ed5b1

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

rest-api-spec/src/main/resources/rest-api-spec/test/index/100_partial_flat_object.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ teardown:
114114
# and no dynamic fields were created.
115115
"Mappings":
116116
- skip:
117-
version: " - 2.99.99"
118-
reason: "flat_object is introduced in 3.0.0 in main branch"
117+
version: " - 2.16.99"
118+
reason: "flat_object field with null (doc 4) throws exception before 2.17"
119119

120120
- do:
121121
indices.get_mapping:
@@ -131,8 +131,8 @@ teardown:
131131
---
132132
"Supported queries":
133133
- skip:
134-
version: " - 2.99.99"
135-
reason: "flat_object is introduced in 3.0.0 in main branch"
134+
version: " - 2.16.99"
135+
reason: "flat_object field with null (doc 4) throws exception before 2.17"
136136

137137

138138
# Verify Document Count

rest-api-spec/src/main/resources/rest-api-spec/test/index/105_partial_flat_object_nested.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ teardown:
8989
# and no dynamic fields were created.
9090
"Mappings":
9191
- skip:
92-
version: " - 2.99.99"
93-
reason: "flat_object is introduced in 3.0.0 in main branch"
92+
version: " - 2.6.99"
93+
reason: "flat_object is introduced in 2.7"
9494

9595
- do:
9696
indices.get_mapping:
@@ -106,8 +106,8 @@ teardown:
106106
---
107107
"Supported queries":
108108
- skip:
109-
version: " - 2.99.99"
110-
reason: "flat_object is introduced in 3.0.0 in main branch"
109+
version: " - 2.6.99"
110+
reason: "flat_object is introduced in 2.7"
111111

112112

113113
# Verify Document Count

rest-api-spec/src/main/resources/rest-api-spec/test/index/90_flat_object.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ teardown:
9797
---
9898
"Supported queries":
9999
- skip:
100-
version: " - 2.99.99"
101-
reason: "flat_object is introduced in 3.0.0 in main branch"
100+
version: " - 2.6.99"
101+
reason: "flat_object is introduced in 2.7"
102102

103103
# Verify Document Count
104104
- do:
@@ -607,8 +607,8 @@ teardown:
607607
---
608608
"Unsupported":
609609
- skip:
610-
version: " - 2.99.99"
611-
reason: "flat_object is introduced in 3.0.0 in main branch"
610+
version: " - 2.6.99"
611+
reason: "flat_object is introduced in 2.7"
612612

613613
# Mapping parameters (such as index/search analyzers) are currently not supported
614614
# The plan is to support them in the next version

0 commit comments

Comments
 (0)