From 8bf302f6e24fc1941db4a2566a1befab2f782bee Mon Sep 17 00:00:00 2001
From: Clinton Gormley <clint@traveljury.com>
Date: Sun, 9 Feb 2014 14:19:51 +0100
Subject: [PATCH] [TEST] Removed nested quantifier in cat.allocation regex and
 made node name regex more liberal

---
 .../test/cat.allocation/10_basic.yaml         | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/rest-api-spec/test/cat.allocation/10_basic.yaml b/rest-api-spec/test/cat.allocation/10_basic.yaml
index 290ecfe3dfa..40b28ba103d 100644
--- a/rest-api-spec/test/cat.allocation/10_basic.yaml
+++ b/rest-api-spec/test/cat.allocation/10_basic.yaml
@@ -31,13 +31,13 @@ setup:
       $body: >
             /^
               ( 0                   \s+
-                \d+(\.\d+)?+[kmgt]b \s+
-                \d+(\.\d+)?+[kmgt]b \s+
-                \d+(\.\d+)?+[kmgt]b \s+
+                \d+(\.\d+)?[kmgt]b  \s+
+                \d+(\.\d+)?[kmgt]b  \s+
+                \d+(\.\d+)?[kmgt]b  \s+
                 \d+                 \s+
                 [-\w.]+             \s+
                 \d+(\.\d+){3}       \s+
-                \w[-\w\s]*
+                \w.*
                 \n
               )+
             $/
@@ -61,13 +61,13 @@ setup:
       $body: >
             /^
               ( [1-5]               \s+
-                \d+(\.\d+)?+[kmgt]b \s+
-                \d+(\.\d+)?+[kmgt]b \s+
-                \d+(\.\d+)?+[kmgt]b \s+
+                \d+(\.\d+)?[kmgt]b  \s+
+                \d+(\.\d+)?[kmgt]b  \s+
+                \d+(\.\d+)?[kmgt]b  \s+
                 \d+                 \s+
                 [-\w.]+             \s+
                 \d+(\.\d+){3}       \s+
-                \w[-\w\s]*
+                \w.*
                 \n
               )+
               (
@@ -88,13 +88,13 @@ setup:
       $body: >
             /^
               ( 0                   \s+
-                \d+(\.\d+)?+[kmgt]b \s+
-                \d+(\.\d+)?+[kmgt]b \s+
-                \d+(\.\d+)?+[kmgt]b \s+
+                \d+(\.\d+)?[kmgt]b  \s+
+                \d+(\.\d+)?[kmgt]b  \s+
+                \d+(\.\d+)?[kmgt]b  \s+
                 \d+                 \s+
                 [-\w.]+             \s+
                 \d+(\.\d+){3}       \s+
-                [-\w\s]+
+                \w.*
                 \n
               )
             $/
@@ -128,13 +128,13 @@ setup:
                \n
 
               ( \s+0                \s+
-                \d+(\.\d+)?+[kmgt]b \s+
-                \d+(\.\d+)?+[kmgt]b \s+
-                \d+(\.\d+)?+[kmgt]b \s+
+                \d+(\.\d+)?[kmgt]b  \s+
+                \d+(\.\d+)?[kmgt]b  \s+
+                \d+(\.\d+)?[kmgt]b  \s+
                 \d+                 \s+
                 [-\w.]+             \s+
                 \d+(\.\d+){3}       \s+
-                [-\w\s]+
+                \w.*
                 \n
               )+
             $/
@@ -150,7 +150,7 @@ setup:
       $body: >
             /^
               ( \d+                 \s+
-                \w[-\w\s]*
+                \w.*
                 \n
               )+
             $/
@@ -168,7 +168,7 @@ setup:
               \n
               (
                 \s+\d+              \s+
-                \w[-\w\s]*
+                \w.*
                 \n
               )+
             $/
@@ -192,7 +192,7 @@ setup:
                 \d+                 \s+
                 [-\w.]+             \s+
                 \d+(\.\d+){3}       \s+
-                \w[-\w\s]*
+                \w.*
                 \n
               )+
             $/