fix log message tests, ignoring noise from other runs
diff --git a/core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowBasicTest.java b/core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowBasicTest.java
index 67c58c6..8d0ce20 100644
--- a/core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowBasicTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowBasicTest.java
@@ -409,13 +409,12 @@
Object workflowId = ids.get("workflow");
List tasksIds = (List) ids.get("tasks");
- if (logWatcher.getMessages().size()!=8) {
- // add logging for intermittent failure; sometimes we are getting way more messages than we expect
- // on slow servers we might see 9, with a "Blocked by lock on lock-for-incrementor, currently held by <other task>" at the end
- throw new IllegalStateException("Wrong number of messages found ("+logWatcher.getMessages().size()+", not 8): "+logWatcher.getMessages());
- }
+ List<String> msgs = logWatcher.getMessages().stream().filter(x -> !x.startsWith("Blocked by lock")).collect(Collectors.toList());
+ // can have "Blocked by lock on lock-for-incrementor, currently held by JPuhvC9I" from a previous invocation?
- Asserts.assertEquals(logWatcher.getMessages(), MutableList.of(
+ if (msgs.size()!=8) throw new IllegalStateException("Wrong number of messages found ("+msgs.size()+", not 8): "+msgs);
+
+ Asserts.assertEquals(msgs, MutableList.of(
"Starting workflow 'myWorkflow (workflow effector)', moving to first step "+workflowId+"-1",
"Starting step "+workflowId+"-1 in task "+tasksIds.get(0),
"one",
diff --git a/core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowPersistReplayErrorsTest.java b/core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowPersistReplayErrorsTest.java
index 32481c4..88962ea 100644
--- a/core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowPersistReplayErrorsTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowPersistReplayErrorsTest.java
@@ -596,7 +596,9 @@
null);
Asserts.assertEquals(lastInvocation.getUnchecked(), "error-handler worked!");
- List<String> msgs = logWatcher.getMessages();
+ List<String> msgs = logWatcher.getMessages().stream().filter(x -> !x.startsWith("Blocked by lock")).collect(Collectors.toList());
+ // can have "Blocked by lock on lock-for-incrementor, currently held by JPuhvC9I" from a previous invocation?
+
log.info("Error handler output:\n"+msgs.stream().collect(Collectors.joining("\n")));
Asserts.assertEntriesSatisfy(msgs, MutableList.of(
m -> m.matches("Starting workflow 'myWorkflow .workflow effector.', moving to first step .*-1"),
@@ -627,7 +629,9 @@
"output", "error-handler worked!"))));
Asserts.assertEquals(lastInvocation.getUnchecked(), "error-handler worked!");
- List<String> msgs = logWatcher.getMessages();
+ List<String> msgs = logWatcher.getMessages().stream().filter(x -> !x.startsWith("Blocked by lock")).collect(Collectors.toList());
+ // can have "Blocked by lock on lock-for-incrementor, currently held by JPuhvC9I" from a previous invocation?
+
log.info("Error handler output:\n"+msgs.stream().collect(Collectors.joining("\n")));
Asserts.assertEntriesSatisfy(msgs, MutableList.of(
m -> m.matches("Starting workflow 'myWorkflow .workflow effector.', moving to first step .*-1"),
