Remove useless version checks in REST tests. (#30165)

Many tests are added with a version check so that they do not run against a version that doesn't have the feature yet. Master is 7.0, so all tests that do not run against 6.0+ can be removed and the version check can be removed on all tests that always run on 6.0+.
elastic · May 2, 2018 · 231a63f · 231a63f
1 parent 7358946
commit 231a63f
Show file tree

Hide file tree

Showing 74 changed files with 4 additions and 734 deletions.
diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_analyze.yml b/modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_analyze.yml
@@ -2,9 +2,6 @@
 "Custom normalizer with illegal filter in request":
     # Tests analyze api with normalizer. This is in the analysis-common module
     # because there are no filters that support multiTermAware
-    - skip:
-        version: " - 5.99.99"
-        reason:  normalizer support in 6.0.0
     - do:
         catch: bad_request
         indices.analyze:

diff --git a/...les/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_synonyms.yml b/...les/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_synonyms.yml
@@ -1,9 +1,6 @@
 "Synonym filter with char_filter":
   # Tests analyze with synonym and char_filter. This is in the analysis-common module
   # because there are no char filters in core.
-    - skip:
-        version: " - 5.99.99"
-        reason: to support synonym same analysis chain were added in 6.0.0
     - do:
         indices.create:
           index: test_synonym_with_charfilter

diff --git a/modules/parent-join/src/test/resources/rest-api-spec/test/11_parent_child.yml b/modules/parent-join/src/test/resources/rest-api-spec/test/11_parent_child.yml
@@ -13,10 +13,6 @@ setup:
 
 ---
 "Parent/child inner hits":
-    - skip:
-        version: " - 5.5.99"
-        reason:  parent-join was added in 5.6.
-
     - do:
         index:
           index: test

diff --git a/modules/parent-join/src/test/resources/rest-api-spec/test/20_parent_join.yml b/modules/parent-join/src/test/resources/rest-api-spec/test/20_parent_join.yml
@@ -59,10 +59,6 @@ setup:
 
 ---
 "Test basic":
-    - skip:
-        version: " - 5.5.99"
-        reason:  parent-join was added in 5.6
-
     - do:
         search:
           body: { sort: ["join_field", "_id"] }
@@ -104,10 +100,6 @@ setup:
 
 ---
 "Test parent_id query":
-    - skip:
-        version: " - 5.5.99"
-        reason:  parent-join was added in 5.6.
-
     - do:
         search:
           body:

diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/20_validation.yml b/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/20_validation.yml
@@ -8,10 +8,6 @@
 ---
 "no query fails":
 
-  - skip:
-      version: " - 5.99.99"
-      reason: explicit query is required since 6.0.0
-
   - do:
       catch: /query is missing/
       delete_by_query:

diff --git a/...ulti-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/30_field_caps.yml b/...ulti-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/30_field_caps.yml
@@ -1,9 +1,5 @@
 ---
 "Get simple field caps from remote cluster":
-  - skip:
-      version: " - 5.4.99"
-      reason:  this uses a new API functionality that has been added in 5.5.0
-
   - do:
         indices.create:
           index: field_caps_index_2

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/10_basic.yml
@@ -25,9 +25,6 @@
 
 ---
 "Empty _id":
-  - skip:
-      version: " - 5.3.0"
-      reason: empty IDs were not rejected until 5.3.1
   - do:
       bulk:
         refresh: true
@@ -62,11 +59,6 @@
 ---
 "empty action":
 
-  - skip:
-      version: " - 5.4.99"
-      reason: confusing exception messaged caused by empty object fixed in 5.5.0
-      features: ["headers"]
-
   - do:
       catch: /Malformed action\/metadata line \[3\], expected FIELD_NAME but found \[END_OBJECT\]/
       headers:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/10_basic.yml
@@ -129,10 +129,6 @@
 ---
 "Multiple alias names":
 
-  - skip:
-      version: " - 5.99.99"
-      reason:  multiple aliases are supported only from 6.0.0 on
-
   - do:
         indices.create:
             index: test
@@ -265,10 +261,6 @@
 ---
 "Alias sorting":
 
-  - skip:
-      version: " - 5.0.99"
-      reason:  sorting was introduced in 5.1.0
-
   - do:
       indices.create:
         index: test_index

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.indices/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.indices/10_basic.yml
@@ -160,9 +160,6 @@
 
 ---
 "Test cat indices sort":
-  - skip:
-      version: " - 5.0.99"
-      reason:  sorting was introduced in 5.1.0
 
   - do:
       indices.create:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.nodes/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.nodes/10_basic.yml
@@ -60,10 +60,6 @@
 
 ---
 "Additional disk information":
-  - skip:
-      version: " - 5.5.99"
-      reason:  additional disk info added in 5.6.0
-
   - do:
       cat.nodes:
           h: diskAvail,diskTotal,diskUsed,diskUsedPercent
@@ -92,10 +88,6 @@
 
 ---
 "Test cat nodes output with full_id set":
-  - skip:
-      version: " - 5.0.0"
-      reason:  The full_id setting was rejected in 5.0.0 see #21266
-
 
   - do:
       cat.nodes:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.repositories/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.repositories/10_basic.yml
@@ -46,9 +46,6 @@
 
 ---
 "Test cat repositories sort":
-  - skip:
-      version: " - 5.0.99"
-      reason:  sorting was introduced in 5.1.0
   - do:
       snapshot.create_repository:
         repository: test_cat_repo_1

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.segments/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.segments/10_basic.yml
@@ -86,10 +86,6 @@
 ---
 "Test cat segments on closed index behaviour":
 
-  - skip:
-      version: " - 5.99.99"
-      reason:  status code  on closed indices changed in 6.0.0 from 403 to 400
-
   - do:
       indices.create:
         index: index1

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yml
@@ -1,8 +1,5 @@
 ---
 "Help":
-  - skip:
-      version: " - 5.99.99"
-      reason: seq no stats were added in 6.0.0
 
   - do:
       cat.shards:
@@ -219,10 +216,6 @@
 
 ---
 "Test cat shards sort":
-  - skip:
-      version: " - 5.0.99"
-      reason:  sorting was introduced in 5.1.0
-
   - do:
       indices.create:
         index: foo

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.templates/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.templates/10_basic.yml
@@ -1,8 +1,5 @@
 ---
 "Help":
-    - skip:
-        version: " - 5.99.99"
-        reason:  this uses a new API that has been added in 6.0
     - do:
         cat.templates:
           help: true
@@ -17,9 +14,6 @@
 
 ---
 "No templates":
-    - skip:
-        version: " - 5.0.99"
-        reason:  templates were introduced in 5.1.0
     - do:
         cat.templates: {}
 
@@ -31,10 +25,6 @@
 ---
 "Normal templates":
 
-    - skip:
-        version: " - 5.99.99"
-        reason:  this uses a new API that has been added in 6.0
-
     - do:
         indices.put_template:
           name: test
@@ -83,10 +73,6 @@
 ---
 "Filtered templates":
 
-    - skip:
-        version: " - 5.99.99"
-        reason:  this uses a new API that has been added in 6.0
-
     - do:
         indices.put_template:
           name: test
@@ -125,9 +111,6 @@
 
 ---
 "Column headers":
-    - skip:
-        version: " - 5.99.99"
-        reason:  this uses a new API that has been added in 6.0
     - do:
         indices.put_template:
           name: test
@@ -161,9 +144,6 @@
 
 ---
 "Select columns":
-    - skip:
-        version: " - 5.99.99"
-        reason:  this uses a new API that has been added in 6.0
     - do:
         indices.put_template:
           name: test
@@ -194,9 +174,6 @@
 
 ---
 "Sort templates":
-    - skip:
-        version: " - 5.99.99"
-        reason:  this uses a new API that has been added in 6.0
     - do:
         indices.put_template:
           name: test
@@ -245,9 +222,6 @@
 
 ---
 "Multiple template":
-    - skip:
-        version: " - 5.99.99"
-        reason:  this uses a new API that has been added in 6.0
     - do:
         indices.put_template:
           name: test_1

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.allocation_explain/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.allocation_explain/10_basic.yml
@@ -1,19 +1,11 @@
 "bad cluster shard allocation explanation request":
-  - skip:
-      version: " - 5.5.99"
-      reason: response status on bad request was changed starting in 5.6.0
-
   - do:
       # there aren't any unassigned shards to explain
       catch: /illegal_argument_exception/
       cluster.allocation_explain: {}
 
 ---
 "cluster shard allocation explanation test":
-  - skip:
-      version: " - 5.1.99"
-      reason: explain API response output was changed starting in 5.2.0
-
   - do:
       indices.create:
         index: test
@@ -40,10 +32,6 @@
 
 ---
 "cluster shard allocation explanation test with empty request":
-  - skip:
-      version: " - 5.1.99"
-      reason: explain API response output was changed starting in 5.2.0
-
   - do:
       indices.create:
         index: test

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.put_settings/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.put_settings/10_basic.yml
@@ -64,11 +64,6 @@
 ---
 "Test get a default settings":
 
-# this can't be bumped to 5.0.2 until snapshots are published
- - skip:
-        version: " - 5.0.3"
-        reason:  Fetching default group setting was buggy until 5.0.3
-
  - do:
       cluster.get_settings:
         include_defaults: true

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.remote_info/10_info.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.remote_info/10_info.yml
@@ -1,8 +1,5 @@
 ---
 "Get an empty remote info":
-  - skip:
-      version: " - 5.3.99"
-      reason: this API doesn't exist in 5.3.x yet
   - do:
       cluster.remote_info: {}
   - is_true: ''

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/10_basic.yml
@@ -7,10 +7,6 @@
 
 ---
 "get cluster state returns cluster state size with human readable format":
-  - skip:
-      version:  " - 5.99.99"
-      reason:   "cluster state size is only available in v6.0.0 and higher"
-
   - do:
       cluster.state:
         human: true

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/create/30_internal_version.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/create/30_internal_version.yml
@@ -21,10 +21,6 @@
 ---
 "Internal versioning with explicit version":
 
- - skip:
-      version: " - 5.1.1"
-      reason: validation logic only fixed from 5.1.2 onwards
-
  - do:
       catch: bad_request
       create:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/create/35_external_version.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/create/35_external_version.yml
@@ -1,10 +1,6 @@
 ---
 "External version":
 
- - skip:
-      version: " - 5.1.1"
-      reason: validation logic only fixed from 5.1.2 onwards
-
  - do:
       catch:              bad_request
       create:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/field_caps/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/field_caps/10_basic.yml
@@ -75,9 +75,6 @@ setup:
 
 ---
 "Get simple field caps":
-  - skip:
-      version: " - 5.3.99"
-      reason:  this uses a new API that has been added in 5.4.0
 
   - do:
       field_caps:
@@ -116,9 +113,6 @@ setup:
   - is_false: fields.geo.keyword.on_aggregatable_indices
 ---
 "Get nested field caps":
-  - skip:
-      version: " - 5.3.99"
-      reason:  this uses a new API that has been added in 5.4.0
 
   - do:
       field_caps:
@@ -147,9 +141,6 @@ setup:
   - is_false: fields.object\.nested2.keyword.non_searchable_indices
 ---
 "Get prefix field caps":
-  - skip:
-      version: " - 5.3.99"
-      reason:  this uses a new API that has been added in 5.4.0
 
   - do:
       field_caps:
@@ -168,9 +159,6 @@ setup:
 
 ---
 "Mix in non-existing field field caps":
-  - skip:
-      version: " - 5.4.0"
-      reason:  "#24504 fixed a bug in this API in 5.4.1"
 
   - do:
       field_caps: