From 38639074b4d8a7fe19076b31dd2207b6b31412e4 Mon Sep 17 00:00:00 2001
From: Alexander Reelsen <alexander@reelsen.net>
Date: Thu, 28 May 2015 16:24:41 +0200
Subject: [PATCH] Testing: Ensure cat API REST tests are unaffected by
 randomization

The wildcard cat API REST tests relied on bulk.max and bulk.min in
the thread_pool response. However due to the thread pool types being
randomized in InternalTestCluster, the min/max values were not guaranteed
to exist (the cached thread pool type is unbounded and thus does not have a
max value).

In order to prevent this, the test has been removed and now the cat
nodes test is used for wildcard testing, which always returns stats
about the heap.
---
 rest-api-spec/test/cat.nodes/10_basic.yaml       | 10 ++++++++++
 rest-api-spec/test/cat.thread_pool/10_basic.yaml | 12 ------------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/rest-api-spec/test/cat.nodes/10_basic.yaml b/rest-api-spec/test/cat.nodes/10_basic.yaml
index f7e9bedcd0b..5b2ddb7fc38 100755
--- a/rest-api-spec/test/cat.nodes/10_basic.yaml
+++ b/rest-api-spec/test/cat.nodes/10_basic.yaml
@@ -29,6 +29,16 @@
                /^      heap\.current          \s+  heap\.percent  \s+  heap\.max             \s+ \n
                   (\s+ \d+(\.\d+)?[ptgmk]?b   \s+  \d+            \s+  \d+(\.\d+)?[ptgmk]?b  \s+ \n)+  $/
 
+  - do:
+      cat.nodes:
+          h: heap.*
+          v: true
+
+  - match:
+      $body: |
+               /^      heap\.current          \s+  heap\.percent  \s+  heap\.max             \s+ \n
+                  (\s+ \d+(\.\d+)?[ptgmk]?b   \s+  \d+            \s+  \d+(\.\d+)?[ptgmk]?b  \s+ \n)+  $/
+
   - do:
       cat.nodes:
           h: file_desc.current,file_desc.percent,file_desc.max
diff --git a/rest-api-spec/test/cat.thread_pool/10_basic.yaml b/rest-api-spec/test/cat.thread_pool/10_basic.yaml
index 283e353b7a3..edb87ce27b9 100755
--- a/rest-api-spec/test/cat.thread_pool/10_basic.yaml
+++ b/rest-api-spec/test/cat.thread_pool/10_basic.yaml
@@ -29,18 +29,6 @@
                /  #pid       id          host       ip                          port
                ^  (\d+  \s+  \S{4}  \s+  \S+   \s+  (\d{1,3}\.){3}\d{1,3}  \s+  (\d+|-) \s+ \n)+  $/
 
-
-  - do:
-      cat.thread_pool:
-          h: bulk.m*
-
-  - match:
-      $body: |
-               /^ bulk.min  \s+  bulk.max \s+ \n
-                 (\s+  \d+  \s+  \d+  \s+ \n)+  $/
-
-#(\s+  \d+  \s+  \d+ \n)+  $/
-
   - do:
       cat.thread_pool:
           h: id,ba,fa,gea,ga,ia,maa,ma,oa,pa