fix(ci): fix cassandra test flake (#11557)

datahub-project · Oct 8, 2024 · 35dfff7 · 35dfff7
1 parent 8fcd5e8
commit 35dfff7
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git a/...ity/CassandraAspectMigrationsDaoTest.java → ...dra/CassandraAspectMigrationsDaoTest.java b/...ity/CassandraAspectMigrationsDaoTest.java → ...dra/CassandraAspectMigrationsDaoTest.java
@@ -1,12 +1,12 @@
-package com.linkedin.metadata.entity;
+package com.linkedin.metadata.entity.cassandra;
 
 import static org.mockito.Mockito.*;
 
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.linkedin.metadata.CassandraTestUtils;
 import com.linkedin.metadata.config.PreProcessHooks;
-import com.linkedin.metadata.entity.cassandra.CassandraAspectDao;
-import com.linkedin.metadata.entity.cassandra.CassandraRetentionService;
+import com.linkedin.metadata.entity.AspectMigrationsDaoTest;
+import com.linkedin.metadata.entity.EntityServiceImpl;
 import com.linkedin.metadata.event.EventProducer;
 import com.linkedin.metadata.models.registry.EntityRegistryException;
 import com.linkedin.metadata.service.UpdateIndicesService;

diff --git a/...ta/entity/CassandraEntityServiceTest.java → ...cassandra/CassandraEntityServiceTest.java b/...ta/entity/CassandraEntityServiceTest.java → ...cassandra/CassandraEntityServiceTest.java
@@ -1,4 +1,4 @@
-package com.linkedin.metadata.entity;
+package com.linkedin.metadata.entity.cassandra;
 
 import static org.mockito.Mockito.*;
 import static org.testng.Assert.*;
@@ -11,8 +11,10 @@
 import com.linkedin.metadata.AspectIngestionUtils;
 import com.linkedin.metadata.CassandraTestUtils;
 import com.linkedin.metadata.config.PreProcessHooks;
-import com.linkedin.metadata.entity.cassandra.CassandraAspectDao;
-import com.linkedin.metadata.entity.cassandra.CassandraRetentionService;
+import com.linkedin.metadata.entity.EntityServiceAspectRetriever;
+import com.linkedin.metadata.entity.EntityServiceImpl;
+import com.linkedin.metadata.entity.EntityServiceTest;
+import com.linkedin.metadata.entity.ListResult;
 import com.linkedin.metadata.event.EventProducer;
 import com.linkedin.metadata.key.CorpUserKey;
 import com.linkedin.metadata.models.registry.EntityRegistryException;

diff --git a/...imeline/CassandraTimelineServiceTest.java → ...ssandra/CassandraTimelineServiceTest.java b/...imeline/CassandraTimelineServiceTest.java → ...ssandra/CassandraTimelineServiceTest.java
@@ -1,4 +1,4 @@
-package com.linkedin.metadata.timeline;
+package com.linkedin.metadata.timeline.cassandra;
 
 import static org.mockito.Mockito.mock;
 
@@ -9,6 +9,8 @@
 import com.linkedin.metadata.entity.cassandra.CassandraAspectDao;
 import com.linkedin.metadata.event.EventProducer;
 import com.linkedin.metadata.models.registry.EntityRegistryException;
+import com.linkedin.metadata.timeline.TimelineServiceImpl;
+import com.linkedin.metadata.timeline.TimelineServiceTest;
 import org.testcontainers.containers.CassandraContainer;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;

diff --git a/metadata-io/src/test/resources/testng-cassandra.xml b/metadata-io/src/test/resources/testng-cassandra.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="metadata-io-cassandra" parallel="tests" thread-count="1">
+    <test name="cassandra-testcontainers">
+        <packages>
+            <package name="com.linkedin.metadata.entity.cassandra.*" />
+            <package name="com.linkedin.metadata.timeline.cassandra.*"/>
+        </packages>
+    </test>
+</suite>
diff --git a/metadata-io/src/test/resources/testng-other.xml b/metadata-io/src/test/resources/testng-other.xml
@@ -8,6 +8,8 @@
                 <exclude name="com.linkedin.metadata.search.elasticsearch"/>
                 <exclude name="com.linkedin.metadata.graph.search.opensearch" />
                 <exclude name="com.linkedin.metadata.search.opensearch"/>
+                <exclude name="com.linkedin.metadata.entity.cassandra.*" />
+                <exclude name="com.linkedin.metadata.timeline.cassandra.*"/>
             </package>
         </packages>
     </test>

diff --git a/metadata-io/src/test/resources/testng.xml b/metadata-io/src/test/resources/testng.xml
@@ -9,6 +9,7 @@ parallel followed by everything else.
 <suite name="metadata-io-testcontainers">
 <suite-files>
     <suite-file path="testng-search.xml"/>
+    <suite-file path="testng-cassandra.xml"/>
     <suite-file path="testng-other.xml"/>
 </suite-files>
 </suite>