From 1300982e22c7a1265559f46ea8700f57eeef4a2a Mon Sep 17 00:00:00 2001
From: Karel Minarik <karmi@karmi.cz>
Date: Thu, 25 Jul 2013 10:59:14 +0200
Subject: [PATCH] Removed test "setup" in "Indices Analyze" test

When the runner contract is specified as "run all the tests in the file in sequence,
resetting cluster after each file", it makes is hard to translate the concept into
regular Test::Unit environment.

Changed the "Analyze API JSON format - index and field" test to perform the necessary
setup as part of the test code.
---
 .../test/indices.analyze/10_analyze.yaml      | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/rest-api-spec/test/indices.analyze/10_analyze.yaml b/rest-api-spec/test/indices.analyze/10_analyze.yaml
index a7a719d917f..0ad6865c707 100644
--- a/rest-api-spec/test/indices.analyze/10_analyze.yaml
+++ b/rest-api-spec/test/indices.analyze/10_analyze.yaml
@@ -1,16 +1,3 @@
----
-"Analyze API setup":
-    - do:
-        indices.create:
-          index: test
-          body:
-              mappings:
-                test:
-                  properties:
-                    text:
-                      type:     string
-                      analyzer: whitespace
-
 ---
 "Analyze API text format":
     - do:
@@ -42,8 +29,19 @@
 ---
 "Analyze API JSON format - index and field":
     - do:
-        cluster.health:
-          wait_for_status: yellow
+        indices.create:
+          index: test
+          body:
+            mappings:
+              test:
+                properties:
+                  text:
+                    type:     string
+                    analyzer: whitespace
+    - do:
+      cluster.health:
+        wait_for_status: yellow
+
 
     - do:
         indices.analyze: