From 67706a9a190defe4abe4d57e82dd5ef100feef41 Mon Sep 17 00:00:00 2001
From: Karel Minarik <karmi@karmi.cz>
Date: Thu, 30 Jun 2016 11:22:38 +0200
Subject: [PATCH] [SECURITY] Changed the setup/teardown YAML structure in the
 integration test for roles

Related: 176fd6a

Original commit: elastic/x-pack-elasticsearch@90e210dbc29527c5260f3ededa2f2c59408f997a
---
 .../test/roles/11_idx_arrays.yaml             | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/roles/11_idx_arrays.yaml b/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/roles/11_idx_arrays.yaml
index 10909bfb3ab..da66d7ffebb 100644
--- a/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/roles/11_idx_arrays.yaml
+++ b/elasticsearch/x-pack/security/src/test/resources/rest-api-spec/test/roles/11_idx_arrays.yaml
@@ -1,31 +1,32 @@
+---
+setup:
+  - do:
+      cluster.health:
+        wait_for_status: yellow
+
+teardown:
+  - do:
+      xpack.security.delete_role:
+        name: "admin_role2"
+        ignore: 404
+
+  - do:
+      xpack.security.delete_user:
+        username: "joe"
+        ignore: 404
+
+  - do:
+      delete:
+        index: foo
+        type: doc
+        id: 1
+        ignore: 404
+
 ---
 "Test put role api using as array of index names":
   - skip:
       features: headers
 
-  - setup:
-      - do:
-          cluster.health:
-            wait_for_status: yellow
-
-  - teardown:
-      - do:
-          xpack.security.delete_role:
-            name: "admin_role2"
-            ignore: 404
-
-      - do:
-          xpack.security.delete_user:
-            username: "joe"
-            ignore: 404
-
-      - do:
-          delete:
-            index: foo
-            type: doc
-            id: 1
-            ignore: 404
-
   - do:
       xpack.security.put_role:
         name: "admin_role2"