This is an automated email from the ASF dual-hosted git repository.
dhavalshah9131 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new 5a9816a85 RANGER-5339:
TestBaseDao.test5_update_mergesAndFlushesWhenNotBulk unit test failure (#686)
5a9816a85 is described below
commit 5a9816a8559ed1aef7f876fd13c587949241f158
Author: Rakesh Gupta <[email protected]>
AuthorDate: Thu Sep 25 15:58:08 2025 +0530
RANGER-5339: TestBaseDao.test5_update_mergesAndFlushesWhenNotBulk unit test
failure (#686)
---
.../src/test/java/org/apache/ranger/common/db/TestBaseDao.java | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git
a/security-admin/src/test/java/org/apache/ranger/common/db/TestBaseDao.java
b/security-admin/src/test/java/org/apache/ranger/common/db/TestBaseDao.java
index b711c84b6..0fa233cb0 100644
--- a/security-admin/src/test/java/org/apache/ranger/common/db/TestBaseDao.java
+++ b/security-admin/src/test/java/org/apache/ranger/common/db/TestBaseDao.java
@@ -18,10 +18,13 @@
*/
package org.apache.ranger.common.db;
+import org.apache.ranger.biz.RangerBizUtil;
import org.apache.ranger.common.PropertiesUtil;
import org.apache.ranger.db.RangerDaoManager;
import org.apache.ranger.db.RangerDaoManagerBase;
import org.apache.ranger.entity.XXDBBase;
+import org.apache.ranger.security.context.RangerContextHolder;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
@@ -63,6 +66,13 @@ public class TestBaseDao {
@Mock
public EntityManager em;
+ // ensure bulk mode is disabled and context is clean before each test
+ @BeforeEach
+ public void resetBulkModeContext() {
+ RangerContextHolder.resetOpContext();
+ RangerBizUtil.setBulkMode(false);
+ }
+
@Test
public void test1_constructor_usesDefaultEntityManager() {
when(daoManager.getEntityManager()).thenReturn(em);
