TRUNK-6258: Fix tests

openmrs · Aug 14, 2024 · 0b8035b · 0b8035b
1 parent 78b573c
commit 0b8035b
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/api/src/main/java/org/openmrs/util/DatabaseUpdater.java b/api/src/main/java/org/openmrs/util/DatabaseUpdater.java
@@ -602,7 +602,9 @@ public void setId(String id) {
 	 * @return list of change sets that both have and haven't been run
 	 */
 	public static List<OpenMRSChangeSet> getDatabaseChanges() throws Exception {
-		Context.requirePrivilege(PrivilegeConstants.GET_DATABASE_CHANGES);
+		if (Context.isSessionOpen()) { // Do not check privileges if not run in webapp context (e.g. in tests)
+			Context.requirePrivilege(PrivilegeConstants.GET_DATABASE_CHANGES);
+		}
 		List<OpenMRSChangeSet> result = new ArrayList<>();
 
 		String initialSnapshotVersion = changeLogDetective.getInitialLiquibaseSnapshotVersion(CONTEXT,
@@ -651,7 +653,9 @@ public static List<OpenMRSChangeSet> getDatabaseChanges() throws Exception {
 	 * @return list of change sets that were not run yet.
 	 */
 	public static List<OpenMRSChangeSet> getUnrunDatabaseChanges(LiquibaseProvider liquibaseProvider) throws Exception {
-		Context.requirePrivilege(PrivilegeConstants.GET_DATABASE_CHANGES);
+		if (Context.isSessionOpen()) { // Do not check privileges if not run in webapp context (e.g. in tests)
+			Context.requirePrivilege(PrivilegeConstants.GET_DATABASE_CHANGES);
+		}
 		String initialSnapshotVersion = changeLogDetective.getInitialLiquibaseSnapshotVersion(CONTEXT, liquibaseProvider);
 		log.debug("initial snapshot version is '{}'", initialSnapshotVersion);
 
@@ -674,7 +678,9 @@ public static List<OpenMRSChangeSet> getUnrunDatabaseChanges(LiquibaseProvider l
 	 * @return list of change sets
 	 */
 	public static List<OpenMRSChangeSet> getUnrunDatabaseChanges(String... changeLogFilenames) {
-		Context.requirePrivilege(PrivilegeConstants.GET_DATABASE_CHANGES);
+		if (Context.isSessionOpen()) { // Do not check privileges if not run in webapp context (e.g. in tests)
+			Context.requirePrivilege(PrivilegeConstants.GET_DATABASE_CHANGES);
+		}
 		log.debug("looking for un-run change sets in '{}'", Arrays.toString(changeLogFilenames));
 
 		Database database = null;