honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix _cat/allocation rest test 

The rest test for _cat/allocation was failing due to a regular
expression not accounting for space-padded right-justified text.

Also added Improvements to regular expressions to be smarter about optional values
and to use '+' instead of '*' where applicable.
This commit is contained in:
Andrew Selden 2014-05-06 21:29:03 -07:00
parent 9daaae27b3
commit 35f046e24f
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
rest-api-spec/test/cat.allocation/10_basic.yaml
View File

@ -27,9 +27,9 @@
/^
( 0 \s+
\d+(\.\d+)?[kmgt]?b \s+
(\d+(\.\d+)?[kmgt]b)? \s+ #no value from client nodes
(\d+(\.\d+)?[kmgt]b)? \s+ #no value from client nodes
(\d+)? \s+ #no value from client nodes
(\d+(\.\d+)?[kmgt]b \s+)? #no value from client nodes
(\d+(\.\d+)?[kmgt]b \s+)? #no value from client nodes
(\d+ \s+)? #no value from client nodes
[-\w.]+ \s+
\d+(\.\d+){3} \s+
\w.*
@ -55,11 +55,12 @@
- match:
$body: |
/^
( \d+ \s+
( \s* #allow leading spaces to account for right-justified text
\d+ \s+
\d+(\.\d+)?[kmgt]?b \s+
(\d+(\.\d+)?[kmgt]b)? \s+ #no value from client nodes
(\d+(\.\d+)?[kmgt]b)? \s+ #no value from client nodes
(\d+)? \s+ #no value from client nodes
(\d+(\.\d+)?[kmgt]b \s+)? #no value from client nodes
(\d+(\.\d+)?[kmgt]b \s+)? #no value from client nodes
(\d+ \s+)? #no value from client nodes
[-\w.]+ \s+
\d+(\.\d+){3} \s+
\w.*
@ -84,9 +85,9 @@
/^
( 0 \s+
\d+(\.\d+)?[kmgt]?b \s+
(\d+(\.\d+)?[kmgt]b)? \s+ #no value from client nodes
(\d+(\.\d+)?[kmgt]b)? \s+ #no value from client nodes
(\d+)? \s+ #no value from client nodes
(\d+(\.\d+)?[kmgt]b \s+)? #no value from client nodes
(\d+(\.\d+)?[kmgt]b \s+)? #no value from client nodes
(\d+ \s+)? #no value from client nodes
[-\w.]+ \s+
\d+(\.\d+){3} \s+
\w.*
@ -122,11 +123,12 @@
node \s+
\n
( \s+0 \s+
( \s* #allow leading spaces to account for right-justified text
0 \s+
\d+(\.\d+)?[kmgt]?b \s+
(\d+(\.\d+)?[kmgt]b)? \s+ #no value from client nodes
(\d+(\.\d+)?[kmgt]b)? \s+ #no value from client nodes
(\d+)? \s+ #no value from client nodes
(\d+(\.\d+)?[kmgt]b \s+)? #no value from client nodes
(\d+(\.\d+)?[kmgt]b \s+)? #no value from client nodes
(\d+ \s+)? #no value from client nodes
[-\w.]+ \s+
\d+(\.\d+){3} \s+
\w.*
@ -182,9 +184,9 @@
/^
( 0 \s+
\d+ \s+
\d* \s+ #no value from client nodes
\d* \s+ #no value from client nodes
\d* \s+ #no value from client nodes
(\d+ \s+)? #no value from client nodes
(\d+ \s+)? #no value from client nodes
(\d+ \s+)? #no value from client nodes
[-\w.]+ \s+
\d+(\.\d+){3} \s+
\w.*