From d949f5a99ef79459ae984307ba0622ad1c5d5c55 Mon Sep 17 00:00:00 2001
From: Michael Simons <michael.simons@neo4j.com>
Date: Mon, 25 Nov 2024 10:00:14 +0100
Subject: [PATCH] Fix flaky test.

---
 neo4j-ogm-tests/neo4j-ogm-integration-tests/pom.xml      | 9 +++++++--
 .../session/capability/QueryCapabilityGH952Test.java     | 2 ++
 .../org/neo4j/ogm/testutil/TestContainersTestBase.java   | 7 +++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/neo4j-ogm-tests/neo4j-ogm-integration-tests/pom.xml b/neo4j-ogm-tests/neo4j-ogm-integration-tests/pom.xml
index 7bc0bf04d..3babdc7d9 100644
--- a/neo4j-ogm-tests/neo4j-ogm-integration-tests/pom.xml
+++ b/neo4j-ogm-tests/neo4j-ogm-integration-tests/pom.xml
@@ -19,7 +19,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -264,7 +265,7 @@
                         <goals>
                             <goal>test</goal>
                         </goals>
-                        <configuration>
+                        <configuration combine.self="override">
                             <!--
                             The tests for correct handling of overlapping native ids for nodes and relationships
                             (see GH-952) need to be executed on a clean Neo4j instance
@@ -272,6 +273,10 @@
                             <includes>
                                 <include>org.neo4j.ogm.persistence.session.capability.QueryCapabilityGH952Test</include>
                             </includes>
+                            <systemPropertyVariables>
+                                <neo4j.edition>${neo4j.edition}</neo4j.edition>
+                                <disableContainerReuse>true</disableContainerReuse>
+                            </systemPropertyVariables>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/neo4j-ogm-tests/neo4j-ogm-integration-tests/src/test/java/org/neo4j/ogm/persistence/session/capability/QueryCapabilityGH952Test.java b/neo4j-ogm-tests/neo4j-ogm-integration-tests/src/test/java/org/neo4j/ogm/persistence/session/capability/QueryCapabilityGH952Test.java
index c75f5e18d..76c6dba34 100644
--- a/neo4j-ogm-tests/neo4j-ogm-integration-tests/src/test/java/org/neo4j/ogm/persistence/session/capability/QueryCapabilityGH952Test.java
+++ b/neo4j-ogm-tests/neo4j-ogm-integration-tests/src/test/java/org/neo4j/ogm/persistence/session/capability/QueryCapabilityGH952Test.java
@@ -23,12 +23,14 @@
 import java.util.Collections;
 
 import org.assertj.core.api.BDDAssertions;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.neo4j.ogm.domain.gh952.BookWasReadBy;
 import org.neo4j.ogm.session.Session;
 import org.neo4j.ogm.session.SessionFactory;
 import org.neo4j.ogm.testutil.TestContainersTestBase;
+import org.testcontainers.utility.TestcontainersConfiguration;
 
 /**
  * This test class is specifically for GH-952 and needs to be executed separately within a clean JVM and new Neo4j
diff --git a/neo4j-ogm-tests/neo4j-ogm-integration-tests/src/test/java/org/neo4j/ogm/testutil/TestContainersTestBase.java b/neo4j-ogm-tests/neo4j-ogm-integration-tests/src/test/java/org/neo4j/ogm/testutil/TestContainersTestBase.java
index 30a6c13ac..4bc987b22 100644
--- a/neo4j-ogm-tests/neo4j-ogm-integration-tests/src/test/java/org/neo4j/ogm/testutil/TestContainersTestBase.java
+++ b/neo4j-ogm-tests/neo4j-ogm-integration-tests/src/test/java/org/neo4j/ogm/testutil/TestContainersTestBase.java
@@ -92,9 +92,12 @@ public class TestContainersTestBase {
 
             boolean containerReuseSupported = TestcontainersConfiguration
                 .getInstance().environmentSupportsReuse();
+            boolean disableContainerReuse = Boolean.getBoolean("disableContainerReuse");
+            if (disableContainerReuse) {
+                LOGGER.info("Reuse is explicitly disable");
+            }
             neo4jServer = new Neo4jContainer<>(imageName)
-                .withReuse(containerReuseSupported);
-
+                .withReuse(containerReuseSupported && !disableContainerReuse);
             if (acceptAndUseCommercialEdition) {
                 neo4jServer.withEnv("NEO4J_ACCEPT_LICENSE_AGREEMENT", "yes");
             }