[Remove] 6x skip from yml (#2153)

Remove all 6x skip versions from yaml tests since mix 2.0 and 6x clusters are not supported. Signed-off-by: Nicholas Walter Knize <[email protected]>
opensearch-project · Feb 23, 2022 · 3e9a420 · 3e9a420
1 parent 52eaf96
commit 3e9a420
Show file tree

Hide file tree

Showing 123 changed files with 7 additions and 758 deletions.
diff --git a/...is-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/30_tokenizers.yml b/...is-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/30_tokenizers.yml
@@ -24,9 +24,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/...stache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/30_search_template.yml b/...stache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/30_search_template.yml
@@ -141,10 +141,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/.../src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml b/.../src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml
@@ -174,10 +174,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/yamlRestTest/resources/rest-api-spec/test/painless/30_search.yml b/modules/lang-painless/src/yamlRestTest/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/...es/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/70_mov_fn_agg.yml b/...es/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/70_mov_fn_agg.yml
@@ -1,10 +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/.../lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/80_script_score.yml b/.../lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/80_script_score.yml
@@ -1,10 +1,4 @@
 # Integration tests for ScriptScoreQuery using Painless
-
-setup:
-  - skip:
-      version: " - 6.99.99"
-      reason: "script score query was introduced in 7.0.0"
-
 ---
 "Math functions":
 

diff --git a/...nless/src/yamlRestTest/resources/rest-api-spec/test/painless/90_interval_query_filter.yml b/...nless/src/yamlRestTest/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/...les/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/rank_feature/10_basic.yml b/...les/mapper-extras/src/yamlRestTest/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/...es/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/rank_features/10_basic.yml b/...es/mapper-extras/src/yamlRestTest/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/yamlRestTest/resources/rest-api-spec/test/10_basic.yml b/modules/percolator/src/yamlRestTest/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
@@ -74,7 +69,7 @@
               percolate:
                 field: query
                 index: documents_index
-                id: some_id 
+                id: some_id
   - match:  { hits.total:     1  }
 
   - do:

diff --git a/modules/rank-eval/src/yamlRestTest/resources/rest-api-spec/test/rank_eval/10_basic.yml b/modules/rank-eval/src/yamlRestTest/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,
@@ -121,11 +116,6 @@ setup:
 
 ---
 "Mean Reciprocal Rank":
-
-  - skip:
-      version: " - 6.2.99"
-      reason: response format was updated in 6.3
-
   - do:
       rank_eval:
         body: {
@@ -160,11 +150,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/yamlRestTest/resources/rest-api-spec/test/rank_eval/20_dcg.yml b/modules/rank-eval/src/yamlRestTest/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/yamlRestTest/resources/rest-api-spec/test/rank_eval/30_failures.yml b/modules/rank-eval/src/yamlRestTest/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/...k-eval/src/yamlRestTest/resources/rest-api-spec/test/rank_eval/40_rank_eval_templated.yml b/...k-eval/src/yamlRestTest/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/yamlRestTest/resources/rest-api-spec/test/delete_by_query/10_basic.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/10_basic.yml
@@ -91,7 +91,6 @@
   - skip:
       version: "6.7.0 - "
       reason: reindex moved to rely on sequence numbers for concurrency control
-
   - do:
       indices.create:
         index: test
@@ -145,10 +144,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/yamlRestTest/resources/rest-api-spec/test/update_by_query/10_basic.yml b/modules/reindex/src/yamlRestTest/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/...ated-text/src/yamlRestTest/resources/rest-api-spec/test/mapper_annotatedtext/10_basic.yml b/...ated-text/src/yamlRestTest/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
@@ -80,10 +76,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
@@ -96,10 +96,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/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/20_date_range.yml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/20_date_range.yml
@@ -80,9 +80,6 @@
 
 ---
 "Create index with java style index in 6":
-  - skip:
-      version: " - 6.7.99, 7.0.0 -"
-      reason: java.time patterns are allowed since 6.8
   - do:
       indices.create:
         index: java_for_range

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/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/10_basic.yml
@@ -1,10 +1,5 @@
 ---
 "Array of objects":
-
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
-
   - do:
       bulk:
         refresh: true
@@ -28,11 +23,6 @@
 
 ---
 "Empty _id":
-
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
-
   - do:
       bulk:
         refresh: true
@@ -107,12 +97,8 @@
 
 ---
 "empty action":
-
   - skip:
-      version: " - 6.99.99"
-      features: headers
-      reason: types are required in requests before 7.0.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/bulk/20_list_of_strings.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/20_list_of_strings.yml
@@ -1,9 +1,5 @@
 ---
 "List of strings":
-
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
   - do:
       bulk:
         refresh: true

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/30_big_string.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/30_big_string.yml
@@ -1,9 +1,5 @@
 ---
 "One big string":
-
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
   - do:
       bulk:
         refresh: true

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/40_source.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/40_source.yml
@@ -1,9 +1,5 @@
 ---
 "Source filtering":
-
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
   - do:
       index:
         refresh: true

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/50_refresh.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/50_refresh.yml
@@ -1,9 +1,5 @@
 ---
 "refresh=true immediately makes changes are visible in search":
-
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
   - do:
       bulk:
         refresh: true
@@ -20,10 +16,6 @@
 
 ---
 "refresh=empty string immediately makes changes are visible in search":
-
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
   - do:
       bulk:
         refresh: ""
@@ -41,10 +33,6 @@
 
 ---
 "refresh=wait_for waits until changes are visible in search":
-
-  - skip:
-      version: " - 6.99.99"
-      reason: types are required in requests before 7.0.0
   - do:
       bulk:
         refresh: wait_for

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
@@ -1,12 +1,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/cluster.health/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/10_basic.yml
@@ -94,10 +94,6 @@
 
 ---
 "cluster health basic test, one index with wait for no initializing shards":
-  - skip:
-      version: " - 6.1.99"
-      reason: "wait_for_no_initializing_shards is introduced in 6.2.0"
-
   - do:
       indices.create:
         index: test_index