From e21b1e80660e3444ef991d2c226d9b23a73c8fe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Kr=C3=A1l?= Date: Thu, 14 Jul 2016 17:30:32 +0200 Subject: [PATCH] [TEST] add 'yaml' feature for the test runner (#19436) Also renamed 30_yaml.yaml to 30_json.yaml since it tests json, not yaml --- .../resources/rest-api-spec/test/cat.aliases/20_headers.yaml | 2 +- .../test/cat.aliases/{30_yaml.yaml => 30_json.yaml} | 0 .../main/resources/rest-api-spec/test/get/50_with_headers.yaml | 2 +- .../main/java/org/elasticsearch/test/rest/support/Features.java | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/{30_yaml.yaml => 30_json.yaml} (100%) diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/20_headers.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/20_headers.yaml index 16260151a31..c5a806c5615 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/20_headers.yaml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/20_headers.yaml @@ -1,7 +1,7 @@ --- "Simple alias with yaml body through Accept header": - skip: - features: headers + features: ["headers", "yaml"] - do: indices.create: diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/30_yaml.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/30_json.yaml similarity index 100% rename from rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/30_yaml.yaml rename to rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/30_json.yaml diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/50_with_headers.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/50_with_headers.yaml index ed9a5b7c99f..b88dbaafc4f 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/get/50_with_headers.yaml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/get/50_with_headers.yaml @@ -1,7 +1,7 @@ --- "REST test with headers": - skip: - features: headers + features: ["headers", "yaml"] - do: index: diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/support/Features.java b/test/framework/src/main/java/org/elasticsearch/test/rest/support/Features.java index cf33570ef28..76c2f1d2579 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/support/Features.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/support/Features.java @@ -34,7 +34,7 @@ import java.util.List; */ public final class Features { - private static final List SUPPORTED = Arrays.asList("stash_in_path", "groovy_scripting", "headers", "embedded_stash_key"); + private static final List SUPPORTED = Arrays.asList("stash_in_path", "groovy_scripting", "headers", "embedded_stash_key", "yaml"); private Features() {