Clean up outdated skip statements in yaml tests (#41165)

These skip statements become no-ops in 8.0 for we don't support a mixed cluster between 6.x and 8.0. Relates #41164
elastic · Apr 18, 2019 · 8b0a74f · 8b0a74f
1 parent 55db0e2
commit 8b0a74f
Show file tree

Hide file tree

Showing 69 changed files with 6 additions and 459 deletions.
diff --git a/...es/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/20_analyzers.yml b/...es/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/20_analyzers.yml
@@ -69,9 +69,6 @@
 
 ---
 "standard_html_strip":
-    - skip:
-        version: " - 6.99.99"
-        reason:  only starting from version 7.x this throws an error
     - do:
         catch: /\[standard_html_strip\] analyzer is not supported for new indices, use a custom analyzer using \[standard\] tokenizer and \[html_strip\] char_filter, plus \[lowercase\] filter/
         indices.analyze:

diff --git a/...s/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/30_tokenizers.yml b/...s/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/30_tokenizers.yml
@@ -141,9 +141,6 @@
 
 ---
 "ngram_exception":
-    - skip:
-        version: " - 6.99.99"
-        reason: only starting from version 7.x this throws an error
     - do:
         catch: /The difference between max_gram and min_gram in NGram Tokenizer must be less than or equal to[:] \[1\] but was \[2\]\. This limit can be set by changing the \[index.max_ngram_diff\] index level setting\./
         indices.analyze:

diff --git a/...nalysis-common/src/test/resources/rest-api-spec/test/analysis-common/40_token_filters.yml b/...nalysis-common/src/test/resources/rest-api-spec/test/analysis-common/40_token_filters.yml
@@ -1137,10 +1137,6 @@
 
 ---
 "delimited_payload_filter_error":
-    - skip:
-        version: " - 6.99.99"
-        reason:  using delimited_payload_filter throws error from 7.0 on
-
     - do:
         catch: /\[delimited_payload_filter\] is not supported for new indices, use \[delimited_payload\] instead/
         indices.create:

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
@@ -17,8 +17,7 @@
 ---
 "htmlStrip_deprecated":
     - skip:
-        version: " - 6.2.99"
-        reason: deprecated in 6.3
+        reason: deprecated
         features: "warnings"
 
     - do:

diff --git a/.../lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/30_search_template.yml b/.../lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/30_search_template.yml
@@ -128,10 +128,6 @@
 
 ---
 "Test with new response format":
-  - skip:
-      version: " - 6.99.99"
-      reason: hits.total is returned as an object in 7.0.0
-
   - do:
       index:
         index:  test

diff --git a/...mustache/src/test/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml b/...mustache/src/test/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml
@@ -166,10 +166,6 @@ setup:
 
 ---
 "Test with rest_total_hits_as_int":
-  - skip:
-      version: " - 6.99.99"
-      reason: hits.total is returned as an object in 7.0.0
-
   - do:
       put_script:
         id: stored_template_1

diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/30_search.yml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/30_search.yml
@@ -452,10 +452,6 @@
 ---
 
 "Exception on negative score":
-    - skip:
-        version: " - 6.99.99"
-        reason: "check on negative scores was added from 7.0.0 on"
-
     - do:
         index:
             index: test

diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/70_mov_fn_agg.yml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/70_mov_fn_agg.yml
@@ -1,9 +1,6 @@
 # Sanity integration test to make sure the custom context and whitelist work for moving_fn pipeline agg
 #
 setup:
-  - skip:
-        version: " - 6.3.99"
-        reason:  "moving_fn added in 6.4.0"
   - do:
       indices.create:
         index: test

diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/80_script_score.yml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/80_script_score.yml
@@ -1,10 +1,5 @@
 # Integration tests for ScriptScoreQuery using Painless
 
-setup:
-- skip:
-    version: " - 6.99.99"
-    reason: "script score query was introduced in 7.0.0"
-
 ---
 "Math functions":
     - do:

diff --git a/...lang-painless/src/test/resources/rest-api-spec/test/painless/90_interval_query_filter.yml b/...lang-painless/src/test/resources/rest-api-spec/test/painless/90_interval_query_filter.yml
@@ -1,8 +1,4 @@
 setup:
-  - skip:
-      version: " - 6.99.99"
-      reason:  "Implemented in 7.0"
-
   - do:
       indices.create:
         index:  test

diff --git a/modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_feature/10_basic.yml b/modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_feature/10_basic.yml
@@ -1,8 +1,4 @@
 setup:
-  - skip:
-      version: " - 6.99.99"
-      reason: "The rank feature field/query was introduced in 7.0.0"
-
   - do:
       indices.create:
           index: test

diff --git a/modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_features/10_basic.yml b/modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_features/10_basic.yml
@@ -1,8 +1,4 @@
 setup:
-  - skip:
-      version: " - 6.99.99"
-      reason: "The rank_features field was introduced in 7.0.0"
-
   - do:
       indices.create:
           index: test

diff --git a/modules/percolator/src/test/resources/rest-api-spec/test/10_basic.yml b/modules/percolator/src/test/resources/rest-api-spec/test/10_basic.yml
@@ -1,10 +1,5 @@
 ---
 "Test percolator basics via rest":
-
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
-
   - do:
       indices.create:
         index: queries_index

diff --git a/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/10_basic.yml b/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/10_basic.yml
@@ -40,11 +40,6 @@ setup:
 
 ---
 "Response format":
-
-  - skip:
-      version: " - 6.2.99"
-      reason: response format was updated in 6.3
-
   - do:
       rank_eval:
         index: foo,
@@ -120,11 +115,6 @@ setup:
 
 ---
 "Mean Reciprocal Rank":
-
-  - skip:
-      version: " - 6.2.99"
-      reason: response format was updated in 6.3
-
   - do:
       rank_eval:
         body: {
@@ -159,11 +149,6 @@ setup:
 
 ---
 "Expected Reciprocal Rank":
-
-  - skip:
-      version: " - 6.3.99"
-      reason: ERR was introduced in 6.4
-
   - do:
       rank_eval:
         body: {

diff --git a/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/20_dcg.yml b/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/20_dcg.yml
@@ -1,10 +1,5 @@
 ---
 "Response format":
-
-  - skip:
-      version: " - 6.1.99"
-      reason: the ranking evaluation feature is available since 6.2
-
   - do:
       index:
         index:   foo

diff --git a/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/30_failures.yml b/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/30_failures.yml
@@ -1,10 +1,5 @@
 ---
 "Response format":
-
-  - skip:
-      version: " - 6.2.99"
-      reason: response format was updated in 6.3
-
   - do:
       index:
         index:   foo

diff --git a/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/40_rank_eval_templated.yml b/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/40_rank_eval_templated.yml
@@ -48,11 +48,6 @@ setup:
 
 ---
 "Basic rank-eval request with template":
-
-  - skip:
-      version: " - 6.1.99"
-      reason: the ranking evaluation feature is available since 6.2
-
   - do:
       rank_eval:
         body: {

diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/10_basic.yml b/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/10_basic.yml
@@ -145,10 +145,6 @@
 
 ---
 "Response for version conflict (seq no powered)":
-  - skip:
-      version: " - 6.6.99"
-      reason: reindex moved to rely on sequence numbers for concurrency control
-
   - do:
       indices.create:
         index: test

diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/10_basic.yml b/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/10_basic.yml
@@ -116,9 +116,6 @@
 
 ---
 "Response for version conflict (seq no powered)":
-  - skip:
-      version: " - 6.6.99"
-      reason: reindex moved to rely on sequence numbers for concurrency control
   - do:
       indices.create:
         index: test

diff --git a/plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/10_basic.yml b/plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/10_basic.yml
@@ -107,7 +107,6 @@
 ---
 "Normalization with deprecated unicodeSetFilter":
     - skip:
-        version: " - 6.99.99"
         reason:  unicodeSetFilter deprecated in 7.0.0, replaced by unicode_set_filter
         features: "warnings"
 

diff --git a/...er-annotated-text/src/test/resources/rest-api-spec/test/mapper_annotatedtext/10_basic.yml b/...er-annotated-text/src/test/resources/rest-api-spec/test/mapper_annotatedtext/10_basic.yml
@@ -3,10 +3,6 @@
 
 ---
 "annotated highlighter on annotated text":
-  - skip:
-      version: " - 6.4.99"
-      reason: Annotated text type introduced in 6.5.0
-
   - do:
       indices.create:
         index: annotated
@@ -45,10 +41,6 @@
 
 ---
 "issue 39395 thread safety issue -requires multiple calls to reveal":
-  - skip:
-      version: " - 6.4.99"
-      reason: Annotated text type introduced in 6.5.0
-
   - do:
       indices.create:
         index: annotated

diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml
@@ -61,10 +61,6 @@
 
 ---
 "skip_unavailable is returned as part of _remote/info response":
-  - skip:
-      version: " - 6.0.99"
-      reason: "skip_unavailable is only returned from 6.1.0 on"
-
   - do:
       cluster.get_settings:
         include_defaults: true

diff --git a/...h-all-dependencies/src/test/resources/rest-api-spec/test/ingest/20_combine_processors.yml b/...h-all-dependencies/src/test/resources/rest-api-spec/test/ingest/20_combine_processors.yml
@@ -1,10 +1,5 @@
 ---
 "Test with date processor":
-  - skip:
-      version: " - 6.9.99"
-      reason: pre-7.0.0 requires the 8 prefix for Java time formats, so would treat the format in this test as a Joda time format
-      features: "warnings"
-
   - do:
       ingest.put_pipeline:
         id: "_id"

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/60_deprecated.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/60_deprecated.yml
@@ -2,11 +2,6 @@
 ---
 "Deprecated parameters should fail in Bulk query":
 
-   - skip:
-       version: " - 6.99.99"
-       reason:  some parameters are removed starting from 7.0, their equivalents without underscore are used instead
-       features: "warnings"
-
    - do:
        catch:  bad_request
        bulk:

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/80_cas.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/80_cas.yml
@@ -1,10 +1,5 @@
 ---
 "Compare And Swap Sequence Numbers":
-
- - skip:
-      version: " - 6.99.99"
-      reason:  typeless API are add in 7.0.0
-
  - do:
       index:
           index:  test_1

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/30_cas.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/30_cas.yml
@@ -1,10 +1,5 @@
 ---
 "Compare And Swap Sequence Numbers":
-
- - skip:
-      version: " - 6.99.99"
-      reason:  typesless api was introduces in 7.0
-
  - do:
       index:
           index:  test_1

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/70_mix_typeless_typeful.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/70_mix_typeless_typeful.yml
@@ -1,10 +1,5 @@
 ---
 "Index with typeless API on an index that has types":
-
- - skip:
-      version: " - 6.99.99"
-      reason:  Typeless APIs were introduced in 7.0.0
-
  - do:
       indices.create: # not using include_type_name: false on purpose
           include_type_name: true
@@ -64,11 +59,6 @@
 
 ---
 "Index call that introduces new field mappings":
-
-  - skip:
-      version: " - 6.99.99"
-      reason:  Typeless APIs were introduced in 7.0.0
-
   - do:
       indices.create: # not using include_type_name: false on purpose
         include_type_name: true

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.clear_cache/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.clear_cache/10_basic.yml
@@ -11,10 +11,6 @@
 
 ---
 "clear_cache with fielddata set to true":
-  - skip:
-      version: " - 6.2.99"
-      reason: fielddata was deprecated before 6.3.0
-
   - do:
       indices.clear_cache:
         fielddata: true
diff --git a/...api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml b/...api-spec/src/main/resources/rest-api-spec/test/indices.create/20_mix_typeless_typeful.yml
@@ -1,10 +1,5 @@
 ---
 "Create a typeless index while there is a typed template":
-
- - skip:
-      version: " - 6.6.99"
-      reason: Merging typeless/typed mappings/templates was added in 6.7
-
  - do:
       indices.put_template:
           include_type_name: true
@@ -38,11 +33,6 @@
 
 ---
 "Create a typed index while there is a typeless template":
-
- - skip:
-      version: " - 6.6.99"
-      reason: Merging typeless/typed mappings/templates was added in 6.7
-
  - do:
       indices.put_template:
           include_type_name: false
@@ -77,11 +67,6 @@
 
 ---
 "Implicitly create a typed index while there is a typeless template":
-
- - skip:
-      version: " - 6.99.99"
-      reason: include_type_name only supported as of 6.7
-
  - do:
       indices.put_template:
           include_type_name: false
@@ -102,11 +87,6 @@
 
 ---
 "Implicitly create a typeless index while there is a typed template":
-
- - skip:
-      version: " - 6.99.99"
-      reason: needs typeless index operations to work on typed indices
-
  - do:
       indices.put_template:
           include_type_name: true