This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 71f88dde5dcef1333717fa82e498e63aebb22d53 Author: Alex Heneveld <[email protected]> AuthorDate: Fri Sep 15 11:08:39 2023 +0100 fix log message tests, ignoring noise from other runs --- .../org/apache/brooklyn/core/workflow/WorkflowBasicTest.java | 11 +++++------ .../core/workflow/WorkflowPersistReplayErrorsTest.java | 8 ++++++-- 2 files changed, 11 insertions(+), 8 deletions(-) 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 67c58c64ec..8d0ce20a87 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 @@ public class WorkflowBasicTest extends BrooklynMgmtUnitTestSupport { 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 32481c4e77..88962ea712 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 @@ public class WorkflowPersistReplayErrorsTest extends RebindTestFixture<BasicAppl 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 @@ public class WorkflowPersistReplayErrorsTest extends RebindTestFixture<BasicAppl "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"),
