Skip to content

test: fix flaky AuditIntegrationTest await conditions [DHIS2-21858] (2.43) #24503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
netroms merged 1 commit into from
Jul 21, 2026
Merged

test: fix flaky AuditIntegrationTest await conditions [DHIS2-21858] (2.43) #24503

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/audit/AuditIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.stream.Stream;
import org.hisp.dhis.common.CodeGenerator;
import org.hisp.dhis.common.IdentifiableObjectManager;
import org.hisp.dhis.common.UID;
import org.hisp.dhis.common.auth.ApiHeadersAuthScheme;
Expand Down Expand Up @@ -142,7 +143,7 @@ void testSaveMetadata() {
DataElement dataElement = createDataElement('A');
dataElementService.addDataElement(dataElement);
AuditQuery query = AuditQuery.builder().uid(Sets.newHashSet(dataElement.getUid())).build();
await().atMost(TIMEOUT, TimeUnit.SECONDS).until(() -> auditService.countAudits(query) >= 0);
await().atMost(TIMEOUT, TimeUnit.SECONDS).until(() -> auditService.countAudits(query) >= 1);
List<Audit> audits = auditService.getAudits(query);
assertEquals(1, audits.size());
Audit audit = audits.get(0);
Expand All @@ -155,7 +156,9 @@ void testSaveMetadata() {
@MethodSource("provideAuthSchemes")
void testSaveRoute(AuthScheme authScheme) {
Route route = new Route();
route.setUid(BASE_UID);
// each parameterized run needs its own UID: audits are written asynchronously
// outside the test transaction, so audits for a shared UID leak between runs
route.setUid(CodeGenerator.generateUid());
route.setName("foo");
route.setAuth(authScheme);
route.setUrl("http://stub");
Expand All @@ -167,7 +170,7 @@ void testSaveRoute(AuthScheme authScheme) {
return null;
});
AuditQuery query = AuditQuery.builder().uid(Sets.newHashSet(route.getUid())).build();
await().atMost(TIMEOUT, TimeUnit.SECONDS).until(() -> auditService.countAudits(query) >= 0);
await().atMost(TIMEOUT, TimeUnit.SECONDS).until(() -> auditService.countAudits(query) >= 1);
List<Audit> audits = auditService.getAudits(query);
assertEquals(1, audits.size());
assertFalse(audits.get(0).getData().contains("passw0rd"));
Expand All @@ -185,7 +188,7 @@ void testSaveTrackedEntity() {
TrackedEntity trackedEntity = createTrackedEntity('A', ou, attribute, trackedEntityType);
manager.save(trackedEntity);
AuditQuery query = AuditQuery.builder().uid(Sets.newHashSet(trackedEntity.getUid())).build();
await().atMost(TIMEOUT, TimeUnit.SECONDS).until(() -> auditService.countAudits(query) >= 0);
await().atMost(TIMEOUT, TimeUnit.SECONDS).until(() -> auditService.countAudits(query) >= 1);
List<Audit> audits = auditService.getAudits(query);
assertEquals(1, audits.size());
Audit audit = audits.get(0);
Expand Down Expand Up @@ -214,7 +217,7 @@ void testSaveTrackedAttributeValue() {
attributes.put("attribute", attribute.getUid());
attributes.put("trackedEntity", trackedEntity.getUid());
AuditQuery query = AuditQuery.builder().auditAttributes(attributes).build();
await().atMost(TIMEOUT, TimeUnit.SECONDS).until(() -> auditService.countAudits(query) >= 0);
await().atMost(TIMEOUT, TimeUnit.SECONDS).until(() -> auditService.countAudits(query) >= 1);
List<Audit> audits = auditService.getAudits(query);
assertEquals(1, audits.size());
Audit audit = audits.get(0);
Expand Down Expand Up @@ -283,7 +286,7 @@ void testSaveAggregateDataValue() throws ConflictException {
AuditAttributes attributes = new AuditAttributes();
attributes.put("dataElement", dataElementA.getUid());
AuditQuery query = AuditQuery.builder().auditAttributes(attributes).build();
await().atMost(TIMEOUT, TimeUnit.SECONDS).until(() -> auditService.countAudits(query) >= 0);
await().atMost(TIMEOUT, TimeUnit.SECONDS).until(() -> auditService.countAudits(query) >= 1);
List<Audit> audits = auditService.getAudits(query);
assertEquals(1, audits.size());
Audit audit = audits.get(0);
Expand All @@ -308,7 +311,7 @@ void testSaveProgram() throws IOException {
programStage.addDataElement(dataElement, 0);
manager.save(programStage);
AuditQuery query = AuditQuery.builder().uid(Sets.newHashSet(programStage.getUid())).build();
await().atMost(TIMEOUT, TimeUnit.SECONDS).until(() -> auditService.countAudits(query) >= 0);
await().atMost(TIMEOUT, TimeUnit.SECONDS).until(() -> auditService.countAudits(query) >= 1);
List<Audit> audits = auditService.getAudits(query);
assertEquals(1, audits.size());
Audit audit = audits.get(0);
Expand Down Expand Up @@ -344,7 +347,7 @@ void testSaveDataSet() throws JsonProcessingException {
return null;
});
AuditQuery query = AuditQuery.builder().uid(Sets.newHashSet(dataSet.getUid())).build();
await().atMost(TIMEOUT, TimeUnit.SECONDS).until(() -> auditService.countAudits(query) >= 0);
await().atMost(TIMEOUT, TimeUnit.SECONDS).until(() -> auditService.countAudits(query) >= 1);
List<Audit> audits = auditService.getAudits(query);
assertEquals(1, audits.size());
Audit audit = audits.get(0);
Expand Down
Loading