Check with wait_for_no_initializing_shards

Author: carlosdelest

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml

@@ -58,8 +58,9 @@ setup:
       cluster.health:
         index: .synonyms-2
         level: shards
-        wait_for_status: green
-        timeout: 30s
+        imeout: 60s
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true        t
 
   - do:
       synonyms.get_synonym:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml

@@ -30,20 +30,8 @@ teardown:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: green
-        ignore: 408
-
-  - do:
-      cluster.allocation_explain:
-        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
-        ignore: 400
-
-  - do:
-      cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 20s
-        wait_for_status: green
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true
 
   - do:
       indices.create:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/20_synonyms_get.yml

@@ -27,20 +27,8 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: green
-        ignore: 408
-
-  - do:
-      cluster.allocation_explain:
-        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
-        ignore: 400
-
-  - do:
-      cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 20s
-        wait_for_status: green
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true
 
 ---
 "Get synonyms set":

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/30_synonyms_delete.yml

@@ -25,20 +25,8 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: green
-        ignore: 408
-
-  - do:
-      cluster.allocation_explain:
-        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
-        ignore: 400
-
-  - do:
-      cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 20s
-        wait_for_status: green
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true
 ---
 teardown:
   - do:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/40_synonyms_sets_get.yml

@@ -23,20 +23,8 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: green
-        ignore: 408
-
-  - do:
-      cluster.allocation_explain:
-        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
-        ignore: 400
-
-  - do:
-      cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 20s
-        wait_for_status: green
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true
 
   - do:
       synonyms.put_synonym:
@@ -65,8 +53,8 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 30s
-        wait_for_status: green
-
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true
 
 ---
 teardown:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml

@@ -27,20 +27,8 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: green
-        ignore: 408
-
-  - do:
-      cluster.allocation_explain:
-        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
-        ignore: 400
-
-  - do:
-      cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 20s
-        wait_for_status: green
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true
 ---
 teardown:
   - do:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/60_synonym_rule_get.yml

@@ -27,20 +27,8 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: green
-        ignore: 408
-
-  - do:
-      cluster.allocation_explain:
-        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
-        ignore: 400
-
-  - do:
-      cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 20s
-        wait_for_status: green
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true
 
 ---
 teardown:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/70_synonym_rule_delete.yml

@@ -25,21 +25,8 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: green
-        ignore: 408
-
-  - do:
-      cluster.allocation_explain:
-        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
-        ignore: 400
-
-  - do:
-      cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 20s
-        wait_for_status: green
-
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true
 
 ---
 "Delete synonym rule":

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/80_synonyms_from_index.yml

@@ -24,20 +24,8 @@ setup:
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: green
-        ignore: 408
-
-  - do:
-      cluster.allocation_explain:
-        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
-        ignore: 400
-
-  - do:
-      cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 20s
-        wait_for_status: green
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true
 
   # Create an index with synonym_filter that uses that synonyms set
   - do:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/90_synonyms_reloading_for_synset.yml

@@ -36,20 +36,8 @@
         index: .synonyms-2
         level: shards
         timeout: 60s
-        wait_for_status: green
-        ignore: 408
-
-  - do:
-      cluster.allocation_explain:
-        body: { "index": ".synonyms-2", "shard": 0, "primary": false }
-        ignore: 400
-
-  - do:
-      cluster.health:
-        index: .synonyms-2
-        level: shards
-        timeout: 20s
-        wait_for_status: green
+        wait_for_status: yellow
+        wait_for_no_initializing_shards: true
 
   # Create my_index1 with synonym_filter that uses synonyms_set1
   - do: