You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2020/12/23 13:52:06 UTC
[tinkerpop] branch master updated (269a045 -> 44bbf76)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from 269a045 TINKERPOP-2485 Improved quality of http tests. CTR
add 580e03a TINKERPOP-2485 Improved quality of http tests. CTR
new 44bbf76 Merge branch '3.4-dev'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[tinkerpop] 01/01: Merge branch '3.4-dev'
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 44bbf76782291598cb8d428dcad65d1289692bd3
Merge: 269a045 580e03a
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Dec 23 08:51:17 2020 -0500
Merge branch '3.4-dev'
.../tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
index 9e8062c,e5910cd..c058ac4
--- 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
@@@ -291,12 -292,16 +291,12 @@@ public class GremlinServerAuditLogInteg
final List<LoggingEvent> log = recordingAppender.getEvents();
final Stream<LoggingEvent> auditEvents = log.stream().filter(event -> event.getLoggerName().equals(AUDIT_LOGGER_NAME));
final LoggingEvent authEvent = auditEvents
- .filter(event -> event.getMessage().toString().contains("Krb5Authenticator")).iterator().next();
+ .filter(event -> event.getMessage().toString().contains(simpleAuthenticatorName)).iterator().next();
final String authMsg = authEvent.getMessage().toString();
assertTrue(authEvent.getLevel() == INFO &&
- authMsg.matches(String.format("User %s with address .*? authenticated by Krb5Authenticator", kdcServer.clientPrincipalName)));
- assertTrue(log.stream().anyMatch(item -> item.getLevel() == INFO &&
- item.getMessage().toString().matches("User with address .*? requested: 1\\+1")));
- assertTrue(log.stream().anyMatch(item -> item.getLevel() == INFO &&
- item.getMessage().toString().matches("User with address .*? requested: 1\\+2")));
+ authMsg.matches(String.format("User %s with address .*? authenticated by %s", "stephen", simpleAuthenticatorName)));
assertTrue(log.stream().anyMatch(item -> item.getLevel() == INFO &&
- item.getMessage().toString().matches("User with address .*? requested: 1-1")));
- item.getMessage().toString().matches("User with address .*? requested: 1\\+3")));
++ item.getMessage().toString().matches("User with address .*? requested: 2-1")));
}
@Test