diff options
author | Martin Polden <mpolden@mpolden.no> | 2018-03-20 09:14:14 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2018-03-20 09:14:14 +0100 |
commit | 15a8b7e0bc6c3294865247f782b504d2ef4dae28 (patch) | |
tree | e7d4ac88d9fe7625ce6a1b548aaec49ae9f37084 /node-repository | |
parent | 601b4777257e9d1694bdc6987d2b63ee6ccf52dc (diff) |
Less greedy matching
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java index d17f5d70b06..cbdd4dec3dc 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java @@ -587,9 +587,11 @@ public class RestApiTest { String responseString = container.handleRequest(request).getBodyAsString(); if (expectedResponse.contains("(ignore)")) { // Convert expected response to a literal pattern and replace any ignored field with a pattern that matches - // anything + // until the first stop character + String stopCharacters = "[^,:\\\\[\\\\]{}]"; String expectedResponsePattern = Pattern.quote(expectedResponse) - .replaceAll("\"?\\(ignore\\)\"?", "\\\\E.*\\\\Q"); + .replaceAll("\"?\\(ignore\\)\"?", "\\\\E" + + stopCharacters + "*\\\\Q"); if (!Pattern.matches(expectedResponsePattern, responseString)) { throw new ComparisonFailure(responseFile + " (with ignored fields)", expectedResponsePattern, responseString); |