From b139f4e0bf7566932746126beb06423a5b539b93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Honza=20Kr=C3=A1l?= <honza.kral@gmail.com>
Date: Tue, 22 Mar 2016 20:58:41 +0100
Subject: [PATCH] [TEST] Move yaml test requiring yaml, add skip:yaml

Clients don't ship with yaml (de)serializer by default so this test must
be optionally skipped
---
 .../test/cat.aliases/10_basic.yaml            | 25 ----------------
 .../test/cat.aliases/30_yaml.yaml             | 29 +++++++++++++++++++
 .../test/rest/support/Features.java           |  2 +-
 3 files changed, 30 insertions(+), 26 deletions(-)
 create mode 100644 rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/30_yaml.yaml

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/10_basic.yaml
index 423ca29a002..770c5c8b441 100755
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/10_basic.yaml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/10_basic.yaml
@@ -49,31 +49,6 @@
                     -                   \s+
                 $/
 
----
-"Simple alias with yaml body through format argument":
-
-  - do:
-        indices.create:
-            index: test
-
-  - do:
-        indices.put_alias:
-            index: test
-            name:  test_alias
-
-  - do:
-      cat.aliases:
-        format: yaml
-
-  - match:
-      $body: |
-        /^---\n
-          -\s+alias:\s+"test_alias"\s+
-              index:\s+"test"\s+
-              filter:\s+"-"\s+
-              routing.index:\s+"-"\s+
-              routing.search:\s+"-"\s+$/
-
 ---
 "Complex alias":
 
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_yaml.yaml
new file mode 100644
index 00000000000..c892891f08f
--- /dev/null
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/30_yaml.yaml
@@ -0,0 +1,29 @@
+---
+"Simple alias with yaml body through format argument":
+
+  - skip:
+      features: yaml
+
+  - do:
+        indices.create:
+            index: test
+
+  - do:
+        indices.put_alias:
+            index: test
+            name:  test_alias
+
+  - do:
+      cat.aliases:
+        format: yaml
+
+  - match:
+      $body: |
+        /^---\n
+          -\s+alias:\s+"test_alias"\s+
+              index:\s+"test"\s+
+              filter:\s+"-"\s+
+              routing.index:\s+"-"\s+
+              routing.search:\s+"-"\s+$/
+
+
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 0f51f72e8e5..66ba1528b90 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<String> SUPPORTED = Arrays.asList("stash_in_path", "groovy_scripting", "headers");
+    private static final List<String> SUPPORTED = Arrays.asList("stash_in_path", "groovy_scripting", "headers", "yaml");
 
     private Features() {