Repository: incubator-brooklyn Updated Branches: refs/heads/master 6d0089086 -> c0021ca1b
pass flags to assertContentEventuallyMatches for setting timeout Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/68b774f8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/68b774f8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/68b774f8 Branch: refs/heads/master Commit: 68b774f8a1e46ba2bd07fcc8d5d926b6ed3d8308 Parents: 6d00890 Author: John McCabe <[email protected]> Authored: Fri Oct 30 14:34:38 2015 +0000 Committer: John McCabe <[email protected]> Committed: Fri Oct 30 14:34:38 2015 +0000 ---------------------------------------------------------------------- .../src/main/java/org/apache/brooklyn/test/HttpTestUtils.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/68b774f8/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java ---------------------------------------------------------------------- diff --git a/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java b/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java index eed5ef4..a554876 100644 --- a/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java +++ b/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java @@ -292,7 +292,11 @@ public class HttpTestUtils { } public static void assertContentEventuallyMatches(final String url, final String regex) { - Asserts.succeedsEventually(new Runnable() { + assertContentEventuallyMatches(MutableMap.of(), url, regex); + } + + public static void assertContentEventuallyMatches(Map flags, final String url, final String regex) { + Asserts.succeedsEventually(flags, new Runnable() { @Override public void run() { assertContentMatches(url, regex);
