From 75184827ebd73d6eb6f801f18a748fc9d370053f Mon Sep 17 00:00:00 2001 From: Emelie Bondesson <57797772+EmelieBondesson@users.noreply.github.com> Date: Fri, 20 Sep 2024 12:16:02 +0200 Subject: [PATCH] Changed regex in test to match output from updated logger and old output (#514) --- src/test/java/com/neo4j/docker/neo4jadmin/TestDumpLoad.java | 2 +- src/test/java/com/neo4j/docker/neo4jadmin/TestDumpLoad44.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/neo4j/docker/neo4jadmin/TestDumpLoad.java b/src/test/java/com/neo4j/docker/neo4jadmin/TestDumpLoad.java index 70bccd33..0fa8983c 100644 --- a/src/test/java/com/neo4j/docker/neo4jadmin/TestDumpLoad.java +++ b/src/test/java/com/neo4j/docker/neo4jadmin/TestDumpLoad.java @@ -61,7 +61,7 @@ private GenericContainer createAdminContainer( boolean asDefaultUser ) container.withEnv( "NEO4J_ACCEPT_LICENSE_AGREEMENT", "yes" ) .withExposedPorts( 7474, 7687 ) .withLogConsumer( new Slf4jLogConsumer( log ) ) - .waitingFor( new LogMessageWaitStrategy().withRegEx( "^Done: \\d+ files, [\\d\\.,]+[KMGi]+B processed\\..*" ) ) + .waitingFor( new LogMessageWaitStrategy().withRegEx( "^Done: \\d+ files, [\\d\\.,]+[KMGi]*B processed.*" ) ) // .waitingFor( new LogMessageWaitStrategy().withRegEx( "^Done: .*" ) ) .withStartupCheckStrategy( new OneShotStartupCheckStrategy().withTimeout( Duration.ofSeconds( 90 ) ) ); if(!asDefaultUser) diff --git a/src/test/java/com/neo4j/docker/neo4jadmin/TestDumpLoad44.java b/src/test/java/com/neo4j/docker/neo4jadmin/TestDumpLoad44.java index 3cbd106d..c7d4237e 100644 --- a/src/test/java/com/neo4j/docker/neo4jadmin/TestDumpLoad44.java +++ b/src/test/java/com/neo4j/docker/neo4jadmin/TestDumpLoad44.java @@ -70,7 +70,7 @@ private GenericContainer createAdminContainer( boolean asDefaultUser ) container.withEnv( "NEO4J_ACCEPT_LICENSE_AGREEMENT", "yes" ) .withExposedPorts( 7474, 7687 ) .withLogConsumer( new Slf4jLogConsumer( log ) ) - .waitingFor( new LogMessageWaitStrategy().withRegEx( "^Done: \\d+ files, [\\d\\.,]+[KMGi]+B processed\\..*" ) ) + .waitingFor( new LogMessageWaitStrategy().withRegEx( "^Done: \\d+ files, [\\d\\.,]+[KMGi]*B processed.*" ) ) .withStartupCheckStrategy( new OneShotStartupCheckStrategy().withTimeout( Duration.ofSeconds( 90 ) ) ); if(!asDefaultUser) {