Browse Source

[TEST] Removed nested quantifier in cat.allocation regex and made node name regex more liberal

Clinton Gormley 11 years ago
parent
commit
8bf302f6e2
1 changed files with 19 additions and 19 deletions
  1. 19 19
      rest-api-spec/test/cat.allocation/10_basic.yaml

+ 19 - 19
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
               )+
             $/