Browse Source

Increase timeout for tasks processing in tests

pull/10201/head
ViacheslavKlimov 2 years ago
parent
commit
3ddda71e14
  1. 2
      application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
  2. 9
      application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java

2
application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java

@ -376,7 +376,7 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
} catch (Exception e) {
throw new RuntimeException(e);
}
Awaitility.await("all tasks processed").atMost(TIMEOUT, TimeUnit.SECONDS).during(300, TimeUnit.MILLISECONDS)
Awaitility.await("all tasks processed").atMost(60, TimeUnit.SECONDS).during(300, TimeUnit.MILLISECONDS)
.until(() -> storage.getLag("tb_housekeeper") == 0);
}

9
application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java

@ -260,8 +260,7 @@ public class TenantControllerTest extends AbstractControllerTest {
for (int i = 0; i < cntEntity; i++) {
Tenant tenant = new Tenant();
tenant.setTitle("Tenant" + i);
createFutures.add(executor.submit(() ->
saveTenant(tenant)));
createFutures.add(executor.submit(() -> saveTenant(tenant)));
}
tenants.addAll(Futures.allAsList(createFutures).get(TIMEOUT, TimeUnit.SECONDS));
@ -304,8 +303,7 @@ public class TenantControllerTest extends AbstractControllerTest {
String title = title1 + suffix;
title = i % 2 == 0 ? title.toLowerCase() : title.toUpperCase();
tenant.setTitle(title);
createFutures.add(executor.submit(() ->
saveTenant(tenant)));
createFutures.add(executor.submit(() -> saveTenant(tenant)));
}
List<Tenant> tenantsTitle1 = Futures.allAsList(createFutures).get(TIMEOUT, TimeUnit.SECONDS);
@ -319,8 +317,7 @@ public class TenantControllerTest extends AbstractControllerTest {
String title = title2 + suffix;
title = i % 2 == 0 ? title.toLowerCase() : title.toUpperCase();
tenant.setTitle(title);
createFutures.add(executor.submit(() ->
saveTenant(tenant)));
createFutures.add(executor.submit(() -> saveTenant(tenant)));
}
List<Tenant> tenantsTitle2 = Futures.allAsList(createFutures).get(TIMEOUT, TimeUnit.SECONDS);

Loading…
Cancel
Save