From 623e4a0fc887b7d1cabfe8cc8496cb22eda2fbcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Kr=C3=A1l?= Date: Tue, 7 Jan 2014 16:19:06 +0100 Subject: [PATCH] [TEST] remove old tests from yaml test suite --- rest-api-spec/test/delete/40_parent.yaml | 5 - .../test/delete_by_query/10_basic.yaml | 51 +------- rest-api-spec/test/exists/30_parent.yaml | 29 +---- .../test/exists/55_parent_with_routing.yaml | 4 - .../test/explain/20_source_filtering.yaml | 4 - rest-api-spec/test/get/30_parent.yaml | 19 +-- .../test/get/70_source_filtering.yaml | 4 - rest-api-spec/test/get_source/10_basic.yaml | 5 - .../test/get_source/15_default_values.yaml | 5 - rest-api-spec/test/get_source/30_parent.yaml | 22 +--- rest-api-spec/test/get_source/40_routing.yaml | 3 - .../get_source/55_parent_with_routing.yaml | 3 - .../test/get_source/60_realtime_refresh.yaml | 3 - .../test/get_source/70_source_filtering.yaml | 3 - rest-api-spec/test/get_source/80_missing.yaml | 9 -- .../20_analyze_text_format.yaml | 13 -- .../test/indices.delete_alias/10_basic.yaml | 3 - .../indices.get_field_mapping/10_basic.yaml | 16 --- .../20_missing_field.yaml | 3 - .../30_missing_type.yaml | 3 - .../40_missing_index.yaml | 3 - .../50_field_wildcards.yaml | 12 -- .../test/indices.get_mapping/10_basic.yaml | 21 +--- .../test/indices.get_template/10_basic.yaml | 3 - .../indices.get_template/20_get_missing.yaml | 20 +--- .../test/indices.put_alias/10_basic.yaml | 4 +- .../test/indices.update_aliases/10_basic.yaml | 4 +- .../test/info/20_lucene_version.yaml | 4 - .../test/mget/12_non_existent_index.yaml | 4 - rest-api-spec/test/mget/20_fields.yaml | 4 +- .../test/mget/20_fields_pre_0.90.3.yaml | 113 ------------------ rest-api-spec/test/mget/30_parent.yaml | 4 - .../test/mget/55_parent_with_routing.yaml | 4 - .../test/mget/70_source_filtering.yaml | 25 ---- rest-api-spec/test/percolate/10_old.yaml | 33 ----- rest-api-spec/test/percolate/15_new.yaml | 3 - .../test/search/10_source_filtering.yaml | 3 - rest-api-spec/test/suggest/10_basic.yaml | 28 +---- .../test/update/22_doc_as_upsert.yaml | 4 - .../test/update/30_internal_version.yaml | 4 - .../test/update/35_external_version.yaml | 4 - rest-api-spec/test/update/50_parent.yaml | 30 +---- 42 files changed, 12 insertions(+), 529 deletions(-) delete mode 100644 rest-api-spec/test/indices.analyze/20_analyze_text_format.yaml delete mode 100644 rest-api-spec/test/mget/20_fields_pre_0.90.3.yaml delete mode 100644 rest-api-spec/test/percolate/10_old.yaml diff --git a/rest-api-spec/test/delete/40_parent.yaml b/rest-api-spec/test/delete/40_parent.yaml index 02c70c05ad3..6e8beca79b4 100644 --- a/rest-api-spec/test/delete/40_parent.yaml +++ b/rest-api-spec/test/delete/40_parent.yaml @@ -1,10 +1,5 @@ --- "Parent": - - - skip: - version: "0 - 0.90.2" - reason: Delete ignores the parent param - - do: indices.create: index: test_1 diff --git a/rest-api-spec/test/delete_by_query/10_basic.yaml b/rest-api-spec/test/delete_by_query/10_basic.yaml index d39cbebae57..be5d3e8a6eb 100644 --- a/rest-api-spec/test/delete_by_query/10_basic.yaml +++ b/rest-api-spec/test/delete_by_query/10_basic.yaml @@ -1,8 +1,5 @@ --- -"Basic delete_by_query, post 1.0": - - skip: - version: "0 - 0.999" - reason: "Since 1.0 the query top-level key in the body is required" +"Basic delete_by_query": - do: index: index: test_1 @@ -37,52 +34,6 @@ - is_true: ok - - do: - indices.refresh: {} - - - do: - count: - index: test_1 - - - match: { count: 2 } ---- -"Basic delete_by_query, pre 1.0": - - skip: - version: "1 - 999" - reason: "Since 1.0 the query top-level key in the body is required" - - do: - index: - index: test_1 - type: test - id: 1 - body: { foo: bar } - - - do: - index: - index: test_1 - type: test - id: 2 - body: { foo: baz } - - - do: - index: - index: test_1 - type: test - id: 3 - body: { foo: foo } - - - do: - indices.refresh: {} - - - do: - delete_by_query: - index: test_1 - body: - match: - foo: bar - - - is_true: ok - - do: indices.refresh: {} diff --git a/rest-api-spec/test/exists/30_parent.yaml b/rest-api-spec/test/exists/30_parent.yaml index 786f364ee43..0f84a1c07d3 100644 --- a/rest-api-spec/test/exists/30_parent.yaml +++ b/rest-api-spec/test/exists/30_parent.yaml @@ -1,9 +1,5 @@ --- setup: - - skip: - version: "0 - 0.90.2" - reason: "Parent not supported in exists https://github.com/elasticsearch/elasticsearch/issues/3276" - - do: indices.create: index: test_1 @@ -35,27 +31,7 @@ setup: - is_true: '' --- -"Parent omitted pre 1.0": - - - skip: - version: "1 - 999" - reason: "Pre 1.0 omitting a parent with exists would just use the id for routing, possibly resulting in 404" - - - do: - exists: - index: test_1 - type: test - id: 1 - - - is_false: '' - - ---- -"Parent omitted post 1.0": - - - skip: - version: "0 - 0.999" - reason: "When a parent is specified in the mapping it cannot be omitted" +"Parent omitted": - do: catch: request @@ -64,6 +40,3 @@ setup: type: test id: 1 - - is_false: '' - - diff --git a/rest-api-spec/test/exists/55_parent_with_routing.yaml b/rest-api-spec/test/exists/55_parent_with_routing.yaml index a7247f30352..1e0c1b60626 100644 --- a/rest-api-spec/test/exists/55_parent_with_routing.yaml +++ b/rest-api-spec/test/exists/55_parent_with_routing.yaml @@ -1,10 +1,6 @@ --- "Parent with routing": - - skip: - version: "0 - 0.90.2" - reason: "Parent not supported in exists https://github.com/elasticsearch/elasticsearch/issues/3276" - - do: indices.create: index: test_1 diff --git a/rest-api-spec/test/explain/20_source_filtering.yaml b/rest-api-spec/test/explain/20_source_filtering.yaml index ce6ce5086bd..04aac330949 100644 --- a/rest-api-spec/test/explain/20_source_filtering.yaml +++ b/rest-api-spec/test/explain/20_source_filtering.yaml @@ -1,9 +1,5 @@ --- "Source filtering": - - skip: - version: "0 - 0.90.999" - reason: "source filtering is not supported in pre 1.0 versions." - - do: index: index: test_1 diff --git a/rest-api-spec/test/get/30_parent.yaml b/rest-api-spec/test/get/30_parent.yaml index 964cdb43344..f7f31d08a2c 100644 --- a/rest-api-spec/test/get/30_parent.yaml +++ b/rest-api-spec/test/get/30_parent.yaml @@ -35,11 +35,7 @@ setup: - match: { fields._routing: 中文} --- -"Parent omitted post 1.0": - - skip: - version: "0 - 0.999" - reason: "Required parent has been introduced in 1.0" - +"Parent omitted": - do: catch: request get: @@ -47,16 +43,3 @@ setup: type: test id: 1 ---- -"Parent omitted pre 1.0": - - skip: - version: "1 - 999" - reason: "Required parent has been introduced in 1.0" - - - do: - catch: missing - get: - index: test_1 - type: test - id: 1 - diff --git a/rest-api-spec/test/get/70_source_filtering.yaml b/rest-api-spec/test/get/70_source_filtering.yaml index 0620ba7f2ad..03572bbbc36 100644 --- a/rest-api-spec/test/get/70_source_filtering.yaml +++ b/rest-api-spec/test/get/70_source_filtering.yaml @@ -1,9 +1,5 @@ --- "Source filtering": - - skip: - version: "0 - 0.90.999" - reason: "source filtering is not supported in pre 1.0 versions." - - do: index: index: test_1 diff --git a/rest-api-spec/test/get_source/10_basic.yaml b/rest-api-spec/test/get_source/10_basic.yaml index 24162dedfc2..f5dbac9199f 100644 --- a/rest-api-spec/test/get_source/10_basic.yaml +++ b/rest-api-spec/test/get_source/10_basic.yaml @@ -1,10 +1,5 @@ --- "Basic": - - - skip: - version: "0 - 0.90.0" - reason: "Get source not supported in pre 0.90.1 versions." - - do: index: index: test_1 diff --git a/rest-api-spec/test/get_source/15_default_values.yaml b/rest-api-spec/test/get_source/15_default_values.yaml index 7814ea42a72..2120d40dcf4 100644 --- a/rest-api-spec/test/get_source/15_default_values.yaml +++ b/rest-api-spec/test/get_source/15_default_values.yaml @@ -1,10 +1,5 @@ --- "Default values": - - - skip: - version: "0 - 0.90.0" - reason: "Get source not supported in pre 0.90.1 versions." - - do: index: index: test_1 diff --git a/rest-api-spec/test/get_source/30_parent.yaml b/rest-api-spec/test/get_source/30_parent.yaml index e5ad4f3fb5b..35edb909131 100644 --- a/rest-api-spec/test/get_source/30_parent.yaml +++ b/rest-api-spec/test/get_source/30_parent.yaml @@ -1,9 +1,5 @@ --- setup: - - skip: - version: "0 - 0.90.0" - reason: "Get source not supported in pre 0.90.1 versions." - - do: indices.create: index: test_1 @@ -36,23 +32,7 @@ setup: - match: { '': {foo: bar}} --- -"Parent omitted pre 1.0": - - skip: - version: "1 - 999" - reason: "Get source not supported in pre 0.90.1 versions." - - - do: - catch: missing - get_source: - index: test_1 - type: test - id: 1 - ---- -"Parent omitted post 1.0": - - skip: - version: "0 - 0.999" - reason: "Required parent has been introduced in 1.0" +"Parent omitted": - do: catch: request diff --git a/rest-api-spec/test/get_source/40_routing.yaml b/rest-api-spec/test/get_source/40_routing.yaml index a0d8c06ae03..349c20cbe65 100644 --- a/rest-api-spec/test/get_source/40_routing.yaml +++ b/rest-api-spec/test/get_source/40_routing.yaml @@ -1,9 +1,6 @@ --- "Routing": - - skip: - version: "0 - 0.90.0" - reason: "Get source not supported in pre 0.90.1 versions." - do: index: index: test_1 diff --git a/rest-api-spec/test/get_source/55_parent_with_routing.yaml b/rest-api-spec/test/get_source/55_parent_with_routing.yaml index 07abe55ca21..d30219e8535 100644 --- a/rest-api-spec/test/get_source/55_parent_with_routing.yaml +++ b/rest-api-spec/test/get_source/55_parent_with_routing.yaml @@ -1,9 +1,6 @@ --- "Parent with routing": - - skip: - version: "0 - 0.90.0" - reason: "Get source not supported in pre 0.90.1 versions." - do: indices.create: index: test_1 diff --git a/rest-api-spec/test/get_source/60_realtime_refresh.yaml b/rest-api-spec/test/get_source/60_realtime_refresh.yaml index a6a2a376623..cad6a18a5ec 100644 --- a/rest-api-spec/test/get_source/60_realtime_refresh.yaml +++ b/rest-api-spec/test/get_source/60_realtime_refresh.yaml @@ -1,9 +1,6 @@ --- "Realtime": - - skip: - version: "0 - 0.90.0" - reason: "Get source not supported in pre 0.90.1 versions." - do: index: index: test_1 diff --git a/rest-api-spec/test/get_source/70_source_filtering.yaml b/rest-api-spec/test/get_source/70_source_filtering.yaml index 5d6c0ad0512..cc168ac25d3 100644 --- a/rest-api-spec/test/get_source/70_source_filtering.yaml +++ b/rest-api-spec/test/get_source/70_source_filtering.yaml @@ -1,8 +1,5 @@ --- "Source filtering": - - skip: - version: "0 - 0.90.999" - reason: "source filtering is not supported in pre 1.0 versions." - do: index: diff --git a/rest-api-spec/test/get_source/80_missing.yaml b/rest-api-spec/test/get_source/80_missing.yaml index 735fb80e374..fba85404111 100644 --- a/rest-api-spec/test/get_source/80_missing.yaml +++ b/rest-api-spec/test/get_source/80_missing.yaml @@ -1,10 +1,6 @@ --- "Missing document with catch": - - skip: - version: "0 - 0.90.0" - reason: "Get source not supported in pre 0.90.1 versions." - - do: catch: missing get_source: @@ -15,11 +11,6 @@ --- "Missing document with ignore": - - skip: - version: "0 - 0.90.0" - reason: "Get source not supported in pre 0.90.1 versions." - - - do: get_source: index: test_1 diff --git a/rest-api-spec/test/indices.analyze/20_analyze_text_format.yaml b/rest-api-spec/test/indices.analyze/20_analyze_text_format.yaml deleted file mode 100644 index a52a59cf97b..00000000000 --- a/rest-api-spec/test/indices.analyze/20_analyze_text_format.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -"Text format": - - skip: - version: "0.90.9-99" - reason: Text format removed in 1.0.0.RC1 - - - do: - indices.analyze: - format: text - text: tHE BLACK and white! AND red - - match: - tokens: "[black:4->9:]\n\n4: \n[white:14->19:]\n\n6: \n[red:25->28:]\n" - diff --git a/rest-api-spec/test/indices.delete_alias/10_basic.yaml b/rest-api-spec/test/indices.delete_alias/10_basic.yaml index 91fcea25572..9f3535f7ef6 100644 --- a/rest-api-spec/test/indices.delete_alias/10_basic.yaml +++ b/rest-api-spec/test/indices.delete_alias/10_basic.yaml @@ -1,8 +1,5 @@ --- "Basic test for delete alias": - - skip: - version: "0 - 0.90.0" - reason: "Delete alias not supported before 0.90.1" - do: indices.create: diff --git a/rest-api-spec/test/indices.get_field_mapping/10_basic.yaml b/rest-api-spec/test/indices.get_field_mapping/10_basic.yaml index 8924b8b78e1..4d4614629c2 100644 --- a/rest-api-spec/test/indices.get_field_mapping/10_basic.yaml +++ b/rest-api-spec/test/indices.get_field_mapping/10_basic.yaml @@ -12,9 +12,6 @@ setup: --- "Get field mapping with no index and type": - - skip: - version: "0 - 0.90.5" - reason: "The API was added in 0.90.6" - do: indices.get_field_mapping: @@ -24,10 +21,6 @@ setup: --- "Get field mapping by index only": - - skip: - version: "0 - 0.90.5" - reason: "The API was added in 0.90.6" - - do: indices.get_field_mapping: index: test_index @@ -37,9 +30,6 @@ setup: --- "Get field mapping by type & field": - - skip: - version: "0 - 0.90.5" - reason: "The API was added in 0.90.6" - do: indices.get_field_mapping: @@ -51,9 +41,6 @@ setup: --- "Get field mapping by type & field, with another field that doesn't exist": - - skip: - version: "0 - 0.90.5" - reason: "The API was added in 0.90.6" - do: indices.get_field_mapping: @@ -66,9 +53,6 @@ setup: --- "Get field mapping with include_defaults": - - skip: - version: "0 - 0.90.5" - reason: "The API was added in 0.90.6" - do: indices.get_field_mapping: diff --git a/rest-api-spec/test/indices.get_field_mapping/20_missing_field.yaml b/rest-api-spec/test/indices.get_field_mapping/20_missing_field.yaml index 6f75e3a2629..0a3dd47c665 100644 --- a/rest-api-spec/test/indices.get_field_mapping/20_missing_field.yaml +++ b/rest-api-spec/test/indices.get_field_mapping/20_missing_field.yaml @@ -1,8 +1,5 @@ --- "Raise 404 when field doesn't exist": - - skip: - version: "0 - 0.90.5" - reason: "get field mapping was added in 0.90.6" - do: indices.create: diff --git a/rest-api-spec/test/indices.get_field_mapping/30_missing_type.yaml b/rest-api-spec/test/indices.get_field_mapping/30_missing_type.yaml index 38e1d11dec3..77d194fd926 100644 --- a/rest-api-spec/test/indices.get_field_mapping/30_missing_type.yaml +++ b/rest-api-spec/test/indices.get_field_mapping/30_missing_type.yaml @@ -1,8 +1,5 @@ --- "Raise 404 when type doesn't exist": - - skip: - version: "0 - 0.90.5" - reason: "get field mapping was added in 0.90.6" - do: indices.create: diff --git a/rest-api-spec/test/indices.get_field_mapping/40_missing_index.yaml b/rest-api-spec/test/indices.get_field_mapping/40_missing_index.yaml index b85527544bb..ab2d985f720 100644 --- a/rest-api-spec/test/indices.get_field_mapping/40_missing_index.yaml +++ b/rest-api-spec/test/indices.get_field_mapping/40_missing_index.yaml @@ -1,8 +1,5 @@ --- "Raise 404 when index doesn't exist": - - skip: - version: "0 - 0.90.5" - reason: "get field mapping was added in 0.90.6" - do: catch: missing diff --git a/rest-api-spec/test/indices.get_field_mapping/50_field_wildcards.yaml b/rest-api-spec/test/indices.get_field_mapping/50_field_wildcards.yaml index c86f30db390..879d74988f5 100644 --- a/rest-api-spec/test/indices.get_field_mapping/50_field_wildcards.yaml +++ b/rest-api-spec/test/indices.get_field_mapping/50_field_wildcards.yaml @@ -25,9 +25,6 @@ setup: --- "Get field mapping with * for fields": - - skip: - version: "0 - 0.90.7" - reason: "The API was added in 0.90.8" - do: indices.get_field_mapping: @@ -41,9 +38,6 @@ setup: --- "Get field mapping with t* for fields": - - skip: - version: "0 - 0.90.7" - reason: "The API was added in 0.90.8" - do: indices.get_field_mapping: @@ -58,9 +52,6 @@ setup: --- "Get field mapping with *t1 for fields": - - skip: - version: "0 - 0.90.7" - reason: "The API was added in 0.90.8" - do: indices.get_field_mapping: @@ -72,9 +63,6 @@ setup: --- "Get field mapping with wildcarded relative names": - - skip: - version: "0 - 0.90.7" - reason: "The API was added in 0.90.8" - do: indices.get_field_mapping: diff --git a/rest-api-spec/test/indices.get_mapping/10_basic.yaml b/rest-api-spec/test/indices.get_mapping/10_basic.yaml index 989e90fcefe..40416435bb9 100644 --- a/rest-api-spec/test/indices.get_mapping/10_basic.yaml +++ b/rest-api-spec/test/indices.get_mapping/10_basic.yaml @@ -21,26 +21,7 @@ setup: - match: {test_index.test_type.properties.text.analyzer: whitespace} --- -"Get type mapping - pre 1.0": - - - skip: - version: "0.90.9 - 999" - reason: "for newer versions the index name is always returned" - - - do: - indices.get_mapping: - index: test_index - type: test_type - - - match: {test_type.properties.text.type: string} - - match: {test_type.properties.text.analyzer: whitespace} - ---- -"Get type mapping - post 1.0": - - - skip: - version: "0 - 0.90.999" - reason: "for older versions, just the type name is returned" +"Get type mapping": - do: indices.get_mapping: diff --git a/rest-api-spec/test/indices.get_template/10_basic.yaml b/rest-api-spec/test/indices.get_template/10_basic.yaml index e394e3b56c2..ba098dbaa1f 100644 --- a/rest-api-spec/test/indices.get_template/10_basic.yaml +++ b/rest-api-spec/test/indices.get_template/10_basic.yaml @@ -17,9 +17,6 @@ - match: {test.settings: {index.number_of_shards: '1', index.number_of_replicas: '0'}} --- "Get all templates": - - skip: - version: "0 - 0.90.3" - reason: "Get all templates not available before 0.90.4" - do: indices.put_template: diff --git a/rest-api-spec/test/indices.get_template/20_get_missing.yaml b/rest-api-spec/test/indices.get_template/20_get_missing.yaml index 7573f82a725..2751f57dacb 100644 --- a/rest-api-spec/test/indices.get_template/20_get_missing.yaml +++ b/rest-api-spec/test/indices.get_template/20_get_missing.yaml @@ -4,26 +4,10 @@ setup: name: '*' ignore: 404 --- -"Get missing template - post 0.90.3": - - skip: - version: "0 - 0.90.2" - reason: "Missing templates throw 404 from 0.90.3" +"Get missing template": + - do: catch: missing indices.get_template: name: test ---- -"Get missing template - pre 0.90.3": - - skip: - version: "0.90.3 - 999" - reason: "Missing templates didn't throw 404 before 0.90.3" - - do: - indices.delete_template: - name: test - ignore: 404 - - do: - indices.get_template: - name: test - - - match: {'': {}} diff --git a/rest-api-spec/test/indices.put_alias/10_basic.yaml b/rest-api-spec/test/indices.put_alias/10_basic.yaml index 0b0f88e910b..49557018e76 100644 --- a/rest-api-spec/test/indices.put_alias/10_basic.yaml +++ b/rest-api-spec/test/indices.put_alias/10_basic.yaml @@ -1,8 +1,6 @@ --- "Basic test for put alias": - - skip: - version: "0 - 0.90.0" - reason: "Put alias not supported before 0.90.1" + - do: indices.create: index: test_index diff --git a/rest-api-spec/test/indices.update_aliases/10_basic.yaml b/rest-api-spec/test/indices.update_aliases/10_basic.yaml index aeadeb2fb4d..6b15a0a0cc2 100644 --- a/rest-api-spec/test/indices.update_aliases/10_basic.yaml +++ b/rest-api-spec/test/indices.update_aliases/10_basic.yaml @@ -1,8 +1,6 @@ --- "Basic test for aliases": - - skip: - version: "0 - 0.90.0" - reason: "Exists alias not supported before 0.90.1" + - do: indices.create: index: test_index diff --git a/rest-api-spec/test/info/20_lucene_version.yaml b/rest-api-spec/test/info/20_lucene_version.yaml index 47f2bd0892d..e67bc80ba01 100644 --- a/rest-api-spec/test/info/20_lucene_version.yaml +++ b/rest-api-spec/test/info/20_lucene_version.yaml @@ -1,9 +1,5 @@ --- "Lucene Version": - - skip: - version: "0 - 0.90.0" - reason: "Lucene version not included in info before 0.90.1: https://github.com/elasticsearch/elasticsearch/issues/2988" - - do: {info: {}} - match: {status: 200} - is_true: version.lucene_version diff --git a/rest-api-spec/test/mget/12_non_existent_index.yaml b/rest-api-spec/test/mget/12_non_existent_index.yaml index 4a987e4e6f6..38ce7079ae9 100644 --- a/rest-api-spec/test/mget/12_non_existent_index.yaml +++ b/rest-api-spec/test/mget/12_non_existent_index.yaml @@ -1,9 +1,5 @@ --- "Non-existent index": - - skip: - version: "0 - 0.90.2" - reason: "See https://github.com/elasticsearch/elasticsearch/issues/3267" - - do: index: index: test_1 diff --git a/rest-api-spec/test/mget/20_fields.yaml b/rest-api-spec/test/mget/20_fields.yaml index 493bd32c2b6..347fc25f67e 100644 --- a/rest-api-spec/test/mget/20_fields.yaml +++ b/rest-api-spec/test/mget/20_fields.yaml @@ -1,8 +1,6 @@ --- "Fields": - - skip: - version: "0 - 0.90.2" - reason: "Single string fields not supported pre 0.90.3. See https://github.com/elasticsearch/elasticsearch/issues/3270" + - do: index: index: test_1 diff --git a/rest-api-spec/test/mget/20_fields_pre_0.90.3.yaml b/rest-api-spec/test/mget/20_fields_pre_0.90.3.yaml deleted file mode 100644 index aaf18f1a25d..00000000000 --- a/rest-api-spec/test/mget/20_fields_pre_0.90.3.yaml +++ /dev/null @@ -1,113 +0,0 @@ ---- -"Fields": - - - skip: - version: "0.90.3 - 999" - reason: "Tests pre 0.90.2 for single string fields" - - - do: - index: - index: test_1 - type: test - id: 1 - body: { foo: bar } - - - do: - cluster.health: - wait_for_status: yellow - - - do: - mget: - index: test_1 - type: test - body: - docs: - - { _id: 1 } - - { _id: 1, fields: foo } - - { _id: 1, fields: [foo] } - - { _id: 1, fields: [foo, _source] } - - - is_false: docs.0.fields - - match: { docs.0._source: { foo: bar }} - - # - match: { docs.1.fields.foo: [bar] } - # - is_false: docs.1._source - - - match: { docs.2.fields.foo: [bar] } - - is_false: docs.2._source - - - match: { docs.3.fields.foo: [bar] } - - match: { docs.3._source: { foo: bar }} - - - do: - mget: - index: test_1 - type: test - fields: foo - body: - docs: - - { _id: 1 } - - { _id: 1, fields: foo } - - { _id: 1, fields: [foo] } - - { _id: 1, fields: [foo, _source] } - - - match: { docs.0.fields.foo: [bar] } - - is_false: docs.0._source - - - match: { docs.1.fields.foo: [bar] } - - is_false: docs.1._source - - - match: { docs.2.fields.foo: [bar] } - - is_false: docs.2._source - - - match: { docs.3.fields.foo: [bar] } - - match: { docs.3._source: { foo: bar }} - - - do: - mget: - index: test_1 - type: test - fields: [foo] - body: - docs: - - { _id: 1 } - - { _id: 1, fields: foo } - - { _id: 1, fields: [foo] } - - { _id: 1, fields: [foo, _source] } - - - match: { docs.0.fields.foo: [bar] } - - is_false: docs.0._source - - - match: { docs.1.fields.foo: [bar] } - - is_false: docs.1._source - - - match: { docs.2.fields.foo: [bar] } - - is_false: docs.2._source - - - match: { docs.3.fields.foo: [bar] } - - match: { docs.3._source: { foo: bar }} - - - do: - mget: - index: test_1 - type: test - fields: [foo, _source] - body: - docs: - - { _id: 1 } - - { _id: 1, fields: foo } - - { _id: 1, fields: [foo] } - - { _id: 1, fields: [foo, _source] } - - - match: { docs.0.fields.foo: [bar] } - - match: { docs.0._source: { foo: bar }} - - # - match: { docs.1.fields.foo: [bar] } - # - is_false: docs.1._source - - - match: { docs.2.fields.foo: [bar] } - - is_false: docs.2._source - - - match: { docs.3.fields.foo: [bar] } - - match: { docs.3._source: { foo: bar }} - diff --git a/rest-api-spec/test/mget/30_parent.yaml b/rest-api-spec/test/mget/30_parent.yaml index 20f00a931b6..6dbd95a24cf 100644 --- a/rest-api-spec/test/mget/30_parent.yaml +++ b/rest-api-spec/test/mget/30_parent.yaml @@ -1,10 +1,6 @@ --- "Parent": - - skip: - version: "0 - 0.90.2" - reason: Parent not supported in mget. https://github.com/elasticsearch/elasticsearch/issues/3274 - - do: indices.create: index: test_1 diff --git a/rest-api-spec/test/mget/55_parent_with_routing.yaml b/rest-api-spec/test/mget/55_parent_with_routing.yaml index f6f2dd48cfb..cf6a0acb992 100644 --- a/rest-api-spec/test/mget/55_parent_with_routing.yaml +++ b/rest-api-spec/test/mget/55_parent_with_routing.yaml @@ -1,10 +1,6 @@ --- "Parent": - - skip: - version: "0 - 0.90.2" - reason: Parent not supported in mget. https://github.com/elasticsearch/elasticsearch/issues/3274 - - do: indices.create: index: test_1 diff --git a/rest-api-spec/test/mget/70_source_filtering.yaml b/rest-api-spec/test/mget/70_source_filtering.yaml index df9e6135f5e..a1c16b30408 100644 --- a/rest-api-spec/test/mget/70_source_filtering.yaml +++ b/rest-api-spec/test/mget/70_source_filtering.yaml @@ -14,9 +14,6 @@ setup: --- "Source filtering - true/false": - - skip: - version: "0 - 0.90.999" - reason: "source filtering is not supported in pre 1.0 versions." - do: mget: @@ -32,9 +29,6 @@ setup: --- "Source filtering - include field": - - skip: - version: "0 - 0.90.999" - reason: "source filtering is not supported in pre 1.0 versions." - do: mget: @@ -49,9 +43,6 @@ setup: --- "Source filtering - include nested field": - - skip: - version: "0 - 0.90.999" - reason: "source filtering is not supported in pre 1.0 versions." - do: mget: @@ -65,9 +56,6 @@ setup: --- "Source filtering - exclude field": - - skip: - version: "0 - 0.90.999" - reason: "source filtering is not supported in pre 1.0 versions." - do: mget: @@ -79,10 +67,6 @@ setup: --- "Source filtering - ids and true/false": - - skip: - version: "0 - 0.90.999" - reason: "source filtering is not supported in pre 1.0 versions." - - do: mget: @@ -102,9 +86,6 @@ setup: --- "Source filtering - ids and include field": - - skip: - version: "0 - 0.90.999" - reason: "source filtering is not supported in pre 1.0 versions." - do: mget: @@ -116,9 +97,6 @@ setup: --- "Source filtering - ids and include nested field": - - skip: - version: "0 - 0.90.999" - reason: "source filtering is not supported in pre 1.0 versions." - do: mget: @@ -130,9 +108,6 @@ setup: --- "Source filtering - ids and exclude field": - - skip: - version: "0 - 0.90.999" - reason: "source filtering is not supported in pre 1.0 versions." - do: mget: diff --git a/rest-api-spec/test/percolate/10_old.yaml b/rest-api-spec/test/percolate/10_old.yaml deleted file mode 100644 index 5f25fd8f7e8..00000000000 --- a/rest-api-spec/test/percolate/10_old.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -"Basic percolation tests": - - skip: - version: "0.90.9 - 999" - reason: "Percolator redesign" - - - do: - indices.create: - index: test_index - - - do: - index: - index: _percolator - type: test_index - id: test_percolator - body: - query: - match_all: {} - - - do: - indices.refresh: {} - - - do: - percolate: - index: test_index - type: test_type - body: - doc: - foo: bar - - - is_true: ok - - - match: {'matches': ['test_percolator']} diff --git a/rest-api-spec/test/percolate/15_new.yaml b/rest-api-spec/test/percolate/15_new.yaml index fedc250eccf..7ce2d9de9ca 100644 --- a/rest-api-spec/test/percolate/15_new.yaml +++ b/rest-api-spec/test/percolate/15_new.yaml @@ -1,8 +1,5 @@ --- "Basic percolation tests": - - skip: - version: "0 - 0.90.999" - reason: "Percolator redesign" - do: indices.create: diff --git a/rest-api-spec/test/search/10_source_filtering.yaml b/rest-api-spec/test/search/10_source_filtering.yaml index 0827339fff5..40a67ba7e1f 100644 --- a/rest-api-spec/test/search/10_source_filtering.yaml +++ b/rest-api-spec/test/search/10_source_filtering.yaml @@ -1,8 +1,5 @@ --- "Source filtering": - - skip: - version: "0 - 0.90.999" - reason: "source filtering is not supported in pre 1.0 versions." - do: index: diff --git a/rest-api-spec/test/suggest/10_basic.yaml b/rest-api-spec/test/suggest/10_basic.yaml index 04322d9eafc..211e95ba79c 100644 --- a/rest-api-spec/test/suggest/10_basic.yaml +++ b/rest-api-spec/test/suggest/10_basic.yaml @@ -1,7 +1,4 @@ setup: - - skip: - version: "0 - 0.90.2" - reason: "Suggest is broken on 0.90.2 - see #3246" - do: index: index: test @@ -12,31 +9,8 @@ setup: - do: indices.refresh: {} - --- -"Basic tests for suggest API - pre v1": - - skip: - version: "1 - 99" - reason: "Standard analyzer uses stopwords" - - - - do: - suggest: - body: - test_suggestion: - text: "The Amsterdma meetpu" - term: - field: body - - - match: {test_suggestion.0.options.0.text: amsterdam} - - match: {test_suggestion.1.options.0.text: meetup} - ---- -"Basic tests for suggest API - post v1": - - skip: - version: "0 - 0.90.999" - reason: "Standard analyzer ignores stopwords" - +"Basic tests for suggest API": - do: suggest: diff --git a/rest-api-spec/test/update/22_doc_as_upsert.yaml b/rest-api-spec/test/update/22_doc_as_upsert.yaml index 6b45c574ca2..af25730fd7a 100644 --- a/rest-api-spec/test/update/22_doc_as_upsert.yaml +++ b/rest-api-spec/test/update/22_doc_as_upsert.yaml @@ -1,10 +1,6 @@ --- "Doc as upsert": - - skip: - version: "0-0.90.1" - reason: "doc_as_upsert added in 0.90.2" - - do: update: index: test_1 diff --git a/rest-api-spec/test/update/30_internal_version.yaml b/rest-api-spec/test/update/30_internal_version.yaml index 1b555c44c93..c9f370638e9 100644 --- a/rest-api-spec/test/update/30_internal_version.yaml +++ b/rest-api-spec/test/update/30_internal_version.yaml @@ -1,10 +1,6 @@ --- "Internal version": - - skip: - version: "0 - 0.90.999" - reason: "Versions not supported by update API before 1.0.0" - - do: catch: conflict update: diff --git a/rest-api-spec/test/update/35_external_version.yaml b/rest-api-spec/test/update/35_external_version.yaml index f24cf302046..a3ca3a9e3fe 100644 --- a/rest-api-spec/test/update/35_external_version.yaml +++ b/rest-api-spec/test/update/35_external_version.yaml @@ -1,10 +1,6 @@ --- "External version": - - skip: - version: "0 - 0.90.999" - reason: "Versions not supported by update API before 1.0.0" - - do: update: index: test_1 diff --git a/rest-api-spec/test/update/50_parent.yaml b/rest-api-spec/test/update/50_parent.yaml index 4b2158d8137..3d15ea9f2a8 100644 --- a/rest-api-spec/test/update/50_parent.yaml +++ b/rest-api-spec/test/update/50_parent.yaml @@ -58,11 +58,7 @@ setup: - match: { get.fields.foo: [baz] } --- -"Parent omitted post 1.0": - - - skip: - version: "0 - 0.999" - reason: "Required parent has been introduced in 1.0" +"Parent omitted": - do: index: @@ -81,27 +77,3 @@ setup: body: doc: { foo: baz } ---- -"Parent omitted pre 1.0": - - - skip: - version: "1 - 999" - reason: "Required parent has been introduced in 1.0" - - - do: - index: - index: test_1 - type: test - id: 1 - parent: 5 - body: { foo: bar } - - - do: - catch: missing - update: - index: test_1 - type: test - id: 1 - body: - doc: { foo: baz } -