Skip to content

Commit 8933919

Browse files
authored
Reenable bw tests after merging #50333. (#50746)
PR #50333 has been merged.
1 parent de2c0c6 commit 8933919

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@ task verifyVersions {
205205
* after the backport of the backcompat code is complete.
206206
*/
207207

208-
boolean bwc_tests_enabled = false
209-
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/50333" /* place a PR link here when committing bwc changes */
208+
boolean bwc_tests_enabled = true
209+
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
210210
if (bwc_tests_enabled == false) {
211211
if (bwc_tests_disabled_issue.isEmpty()) {
212212
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

rest-api-spec/src/main/resources/rest-api-spec/test/field_caps/20_meta.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"Merge metadata across multiple indices":
33

44
- skip:
5-
version: " - 7.99.99"
5+
version: " - 7.5.99"
66
reason: Metadata support was added in 7.6
77

88
- do:

rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/10_basic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
"Update per-field metadata":
114114

115115
- skip:
116-
version: " - 7.99.99"
116+
version: " - 7.5.99"
117117
reason: "Per-field meta was introduced in 7.6"
118118

119119
- do:

server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilities.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public FieldCapabilities(StreamInput in) throws IOException {
125125
this.indices = in.readOptionalStringArray();
126126
this.nonSearchableIndices = in.readOptionalStringArray();
127127
this.nonAggregatableIndices = in.readOptionalStringArray();
128-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
128+
if (in.getVersion().onOrAfter(Version.V_7_6_0)) {
129129
meta = in.readMap(StreamInput::readString, i -> i.readSet(StreamInput::readString));
130130
} else {
131131
meta = Collections.emptyMap();
@@ -141,7 +141,7 @@ public void writeTo(StreamOutput out) throws IOException {
141141
out.writeOptionalStringArray(indices);
142142
out.writeOptionalStringArray(nonSearchableIndices);
143143
out.writeOptionalStringArray(nonAggregatableIndices);
144-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
144+
if (out.getVersion().onOrAfter(Version.V_7_6_0)) {
145145
out.writeMap(meta, StreamOutput::writeString, (o, set) -> o.writeCollection(set, StreamOutput::writeString));
146146
}
147147
}

0 commit comments

Comments
 (0)