Added a pause for tests asserting logs. Logs needed time to flush in the server thread. I don't know of a way to detect that reliably. Hate to rely on pause, but perhaps it will prevent most of the random test failures we tend to see with this body of tests. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/144441a0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/144441a0 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/144441a0 Branch: refs/heads/TINKERPOP-1682 Commit: 144441a04ea76f342077087215f1d768df4cf38f Parents: 138aacd Author: Stephen Mallette <[email protected]> Authored: Tue Jul 11 14:14:28 2017 -0400 Committer: Stephen Mallette <[email protected]> Committed: Tue Jul 11 14:14:28 2017 -0400 ---------------------------------------------------------------------- .../GremlinServerAuditLogIntegrateTest.java | 22 ++++++++++++++++++++ 1 file changed, 22 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/144441a0/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java index 5d90f9c..0eec35b 100644 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java @@ -161,6 +161,9 @@ public class GremlinServerAuditLogIntegrateTest extends AbstractGremlinServerInt cluster.close(); } + // wait for logger to flush - (don't think there is a way to detect this) + Thread.sleep(1000); + // WebSocketChannelizer does not add SaslAuthenticationHandler for AllowAllAuthenticator, // so no authenticated user log line available assertTrue(recordingAppender.logMatchesAny(AUDIT_LOGGER_NAME, INFO, "User with address .*? requested: 1\\+1")); @@ -193,6 +196,9 @@ public class GremlinServerAuditLogIntegrateTest extends AbstractGremlinServerInt m.find(); final String address = m.group(1); + // wait for logger to flush - (don't think there is a way to detect this) + Thread.sleep(1000); + assertTrue(recordingAppender.logContainsAny(AUDIT_LOGGER_NAME, INFO, String.format("User %s with address %s authenticated by %s", username, address, simpleAuthenticatorName))); assertTrue(recordingAppender.logContainsAny(AUDIT_LOGGER_NAME, INFO, @@ -216,6 +222,9 @@ public class GremlinServerAuditLogIntegrateTest extends AbstractGremlinServerInt cluster.close(); } + // wait for logger to flush - (don't think there is a way to detect this) + Thread.sleep(1000); + final List<LoggingEvent> log = recordingAppender.getEvents(); final Stream<LoggingEvent> auditEvents = log.stream().filter(event -> event.getLoggerName().equals(AUDIT_LOGGER_NAME)); final LoggingEvent authEvent = auditEvents @@ -247,6 +256,9 @@ public class GremlinServerAuditLogIntegrateTest extends AbstractGremlinServerInt cluster.close(); } + // wait for logger to flush - (don't think there is a way to detect this) + Thread.sleep(1000); + final List<LoggingEvent> log = recordingAppender.getEvents(); assertFalse(log.stream().anyMatch(item -> item.getLevel() == INFO && item.getMessage().toString().matches("User .*? with address .*? authenticated by Krb5Authenticator"))); @@ -271,6 +283,9 @@ public class GremlinServerAuditLogIntegrateTest extends AbstractGremlinServerInt cluster.close(); } + // wait for logger to flush - (don't think there is a way to detect this) + Thread.sleep(1000); + final List<LoggingEvent> log = recordingAppender.getEvents(); final Stream<LoggingEvent> auditEvents = log.stream().filter(event -> event.getLoggerName().equals(AUDIT_LOGGER_NAME)); final LoggingEvent authEvent = auditEvents @@ -303,6 +318,9 @@ public class GremlinServerAuditLogIntegrateTest extends AbstractGremlinServerInt assertEquals(0, node.get("result").get("data").get(0).intValue()); } + // wait for logger to flush - (don't think there is a way to detect this) + Thread.sleep(1000); + final List<LoggingEvent> log = recordingAppender.getEvents(); final Stream<LoggingEvent> auditEvents = log.stream().filter(event -> event.getLoggerName().equals(AUDIT_LOGGER_NAME)); final LoggingEvent authEvent = auditEvents @@ -336,6 +354,10 @@ public class GremlinServerAuditLogIntegrateTest extends AbstractGremlinServerInt cluster.close(); cluster2.close(); } + + // wait for logger to flush - (don't think there is a way to detect this) + Thread.sleep(1000); + final List<LoggingEvent> log = recordingAppender.getEvents(); final Stream<LoggingEvent> auditEvents = log.stream().filter(event -> event.getLoggerName().equals(AUDIT_LOGGER_NAME)); final Iterator<LoggingEvent> authEvents = auditEvents
