Fix flaky test.

neo4j · Nov 25, 2024 · 5da747d · 5da747d
1 parent 068e065
commit 5da747d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git 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,14 +265,19 @@
                         <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
                             -->
                             <includes>
                                 <include>org.neo4j.ogm.persistence.session.capability.QueryCapabilityGH952Test</include>
                             </includes>
+                            <systemPropertyVariables>
+                                <neo4j.edition>${neo4j.edition}</neo4j.edition>
+                                <disableContainerReuse>true</disableContainerReuse>
+                                <NEO4J_OGM_NEO4J_IMAGE_NAME>neo4j:5.20</NEO4J_OGM_NEO4J_IMAGE_NAME>
+                            </systemPropertyVariables>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/.../src/test/java/org/neo4j/ogm/persistence/session/capability/QueryCapabilityGH952Test.java b/.../src/test/java/org/neo4j/ogm/persistence/session/capability/QueryCapabilityGH952Test.java
@@ -23,8 +23,11 @@
 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.junit.jupiter.api.condition.EnabledIf;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 import org.neo4j.ogm.domain.gh952.BookWasReadBy;
 import org.neo4j.ogm.session.Session;
 import org.neo4j.ogm.session.SessionFactory;
@@ -36,6 +39,7 @@
  *
  * @author Niels Oertel
  */
+@EnabledIfSystemProperty(named = "GH952NativeIdTest", matches = "true")
 public class QueryCapabilityGH952Test extends TestContainersTestBase {
 
     private SessionFactory sessionFactory;

diff --git a/...4j-ogm-integration-tests/src/test/java/org/neo4j/ogm/testutil/TestContainersTestBase.java b/...4j-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.warn("Reuse is explicitly disable");
+            }
             neo4jServer = new Neo4jContainer<>(imageName)
-                .withReuse(containerReuseSupported);
-
+                .withReuse(containerReuseSupported && !disableContainerReuse);
             if (acceptAndUseCommercialEdition) {
                 neo4jServer.withEnv("NEO4J_ACCEPT_LICENSE_AGREEMENT", "yes");
             }