From eb6d3e3eb3bb35c2e4ef6ddfbd753c2750dffdd1 Mon Sep 17 00:00:00 2001 From: Clinton Gormley Date: Thu, 8 May 2014 14:15:47 +0200 Subject: [PATCH] [TEST] Fixed pathological regex in cat.recovery Fixes #6070 --- rest-api-spec/test/cat.recovery/10_basic.yaml | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/rest-api-spec/test/cat.recovery/10_basic.yaml b/rest-api-spec/test/cat.recovery/10_basic.yaml index 4e4de372cf9..1fa9643f7c8 100755 --- a/rest-api-spec/test/cat.recovery/10_basic.yaml +++ b/rest-api-spec/test/cat.recovery/10_basic.yaml @@ -20,15 +20,23 @@ wait_for_status: yellow - do: cat.recovery: {} + - match: $body: | - /(?m)^(index1 \s+ \d+ \s+ \d+ \s+ - (gateway|replica|snapshot|relocating) \s+ - (init|index|start|translog|finalize|done) \s+ - ([-\w/.])+ \s+ - ([-\w/.])+ \s+ - ([-\w/.])+ \s+ - ([-\w/.])+ \s+ - \d+ \s+ \d+\.\d+\% \s+ - \d+ \s+ \d+\.\d+\% \s*)${1,}/ - + /^ + ( index1 \s+ + \d \s+ # shard + \d+ \s+ # time + (gateway|replica|snapshot|relocating) \s+ # type + (init|index|start|translog|finalize|done) \s+ # stage + [-\w./]+ \s+ # source_host + [-\w./]+ \s+ # target_host + [-\w./]+ \s+ # repository + [-\w./]+ \s+ # snapshot + \d+ \s+ # files + \d\.\d+% \s+ # files_percent + \d+ \s+ # bytes + \d\.\d+% \s+ # bytes_percent + \n + )+ + $/