Browse Source

Merge pull request #15162 from smatvienko-tb/fix/audit-log-sysadmin-flaky-test

Fix flaky AuditLogControllerTest#testAuditLogsSysAdmin
pull/15198/head
Viacheslav Klimov 7 months ago
committed by GitHub
parent
commit
e54215efe5
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 8
      application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java

8
application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java

@ -19,6 +19,7 @@ import com.datastax.oss.driver.api.core.uuid.Uuids;
import com.fasterxml.jackson.core.type.TypeReference;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.awaitility.Awaitility;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@ -136,9 +137,10 @@ public class AuditLogControllerTest extends AbstractControllerTest {
doPost("/api/tenantProfile", tenantProfile, TenantProfile.class);
}
List<AuditLog> loadedAuditLogs = getAuditLogs(100, "/api/audit/logs?");
Assert.assertEquals("Have X audit log before this test + New tenant profiles in the test", loadedAuditLogsBefore.size() + 3, loadedAuditLogs.size());
int expectedSize = loadedAuditLogsBefore.size() + 3;
Awaitility.await().atMost(10, TimeUnit.SECONDS).untilAsserted(() ->
Assert.assertEquals("Have X audit log before this test + New tenant profiles in the test",
expectedSize, getAuditLogs(100, "/api/audit/logs?").size()));
}
private List<AuditLog> getAuditLogs(int pageSize, String urlTemplate) throws Exception {

Loading…
Cancel
Save