Skip to content

Commit 9b6255b

Browse files
rgsriramSriram Ganeshmsfroh
authored andcommitted
Fix remove skip tags for version 6 (opensearch-project#17750)
--------- Signed-off-by: Michael Froh <[email protected]> Signed-off-by: Sriram Ganesh <[email protected]> Co-authored-by: Sriram Ganesh <[email protected]> Co-authored-by: Michael Froh <[email protected]> Signed-off-by: Harsh Kothari <[email protected]>
1 parent 726984f commit 9b6255b

Some content is hidden

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

48 files changed

+10
-291
lines changed

modules/geo/src/yamlRestTest/resources/rest-api-spec/test/geo_shape/290_geotile_grid.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
setup:
2-
- skip:
3-
version: " - 6.99.99"
4-
reason: "added in 7.0.0"
52
- do:
63
indices.create:
74
index: test_1

qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/20_date_range.yml

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,3 @@
1-
---
2-
"Create index with joda style index that is incompatible with java.time. (6.0)":
3-
- skip:
4-
features: "allowed_warnings"
5-
version: "6.8.1 -"
6-
reason: change of warning message
7-
- do:
8-
allowed_warnings:
9-
- "Use of 'Y' (year-of-era) will change to 'y' in the next major version of OpenSearch. Prefix your date format with '8' to use the new specifier."
10-
indices.create:
11-
index: joda_for_range
12-
body:
13-
settings:
14-
index:
15-
number_of_replicas: 2
16-
mappings:
17-
"properties":
18-
"time_frame":
19-
"type": "date_range"
20-
"format": "YYYY-MM-dd'T'HH:mmZZ"
21-
22-
- do:
23-
bulk:
24-
refresh: true
25-
body:
26-
- '{"index": {"_index": "joda_for_range"}}'
27-
- '{"time_frame": {"gte": "2019-01-01T00:00+01:00", "lte" : "2019-03-01T00:00+01:00"}}'
28-
29-
- do:
30-
search:
31-
rest_total_hits_as_int: true
32-
index: joda_for_range
33-
body:
34-
query:
35-
range:
36-
time_frame:
37-
gte: "2019-02-01T00:00+01:00"
38-
lte: "2019-02-01T00:00+01:00"
39-
- match: { hits.total: 1 }
40-
41-
---
42-
"Create index with joda style index that is incompatible with java.time (>6.1)":
43-
- skip:
44-
features: "allowed_warnings"
45-
version: " - 6.8.0, 7.0.0 -"
46-
reason: change of warning message, we skip 7 becase this format will be considered java
47-
- do:
48-
allowed_warnings:
49-
- "'Y' year-of-era should be replaced with 'y'. Use 'Y' for week-based-year.; 'Z' time zone offset/id fails when parsing 'Z' for Zulu timezone. Consider using 'X'. Prefix your date format with '8' to use the new specifier."
50-
indices.create:
51-
index: joda_for_range
52-
body:
53-
settings:
54-
index:
55-
number_of_replicas: 2
56-
mappings:
57-
"properties":
58-
"time_frame":
59-
"type": "date_range"
60-
"format": "YYYY-MM-dd'T'HH:mmZZ"
61-
62-
- do:
63-
bulk:
64-
refresh: true
65-
body:
66-
- '{"index": {"_index": "joda_for_range"}}'
67-
- '{"time_frame": {"gte": "2019-01-01T00:00+01:00", "lte" : "2019-03-01T00:00+01:00"}}'
68-
69-
- do:
70-
search:
71-
rest_total_hits_as_int: true
72-
index: joda_for_range
73-
body:
74-
query:
75-
range:
76-
time_frame:
77-
gte: "2019-02-01T00:00+01:00"
78-
lte: "2019-02-01T00:00+01:00"
79-
- match: { hits.total: 1 }
80-
811
---
822
"Create index with java style index in 6":
833
- do:

rest-api-spec/src/main/resources/rest-api-spec/test/cat.thread_pool/10_basic.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@
5454
5555
---
5656
"Test cat thread_pool output":
57-
- skip:
58-
version: " - 6.99.99"
59-
reason: this API was changed in a backwards-incompatible fashion in 7.0.0 so we need to skip in a mixed cluster
6057

6158
- do:
6259
cat.thread_pool: {}

rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/10_basic.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77

88
---
99
"get cluster state returns cluster_uuid at the top level":
10-
- skip:
11-
version: " - 6.3.99"
12-
reason: "cluster state including cluster_uuid at the top level is new in v6.4.0 and higher"
13-
1410
- do:
1511
cluster.state:
1612
human: true

rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/20_filtering.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,6 @@ setup:
156156
---
157157
"Filtering the cluster state returns cluster_uuid at the top level regardless of metric filters":
158158
- skip:
159-
version: " - 6.3.99"
160-
reason: "cluster state including cluster_uuid at the top level is new in v6.4.0 and higher"
161159
features: allowed_warnings
162160

163161
# Get the current cluster_uuid

rest-api-spec/src/main/resources/rest-api-spec/test/cluster.voting_config_exclusions/10_basic.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ teardown:
44

55
---
66
"Get cluster state without voting config exclusions":
7-
- skip:
8-
version: " - 6.99.99"
9-
reason: Voting config exclusions were introduced in 7.0.0
10-
117
- do:
128
cluster.state: {}
139

rest-api-spec/src/main/resources/rest-api-spec/test/create/10_with_id.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
---
22
"Create with ID":
3-
- skip:
4-
version: " - 6.99.99"
5-
reason: types are required in requests before 7.0.0
3+
64
- do:
75
create:
86
index: test_1

rest-api-spec/src/main/resources/rest-api-spec/test/create/15_without_id.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
---
22
"Create without ID":
3-
- skip:
4-
version: " - 6.99.99"
5-
reason: types are required in requests before 7.0.0
3+
64
- do:
75
catch: param
86
create:

rest-api-spec/src/main/resources/rest-api-spec/test/create/35_external_version.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
---
22
"External version":
3-
- skip:
4-
version: " - 6.99.99"
5-
reason: types are required in requests before 7.0.0
3+
64
- do:
75
catch: bad_request
86
create:

rest-api-spec/src/main/resources/rest-api-spec/test/create/40_routing.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
---
22
"Routing":
3-
- skip:
4-
version: " - 6.99.99"
5-
reason: types are required in requests before 7.0.0
3+
64
- do:
75
indices.create:
86
index: test_1

0 commit comments

Comments
 (0)