Await tenant cleanup after tenant deletion in tests

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

@@ -100,6 +100,8 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantProfileId;
 import org.thingsboard.server.common.data.id.UUIDBased;
 import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
+import org.thingsboard.server.common.data.kv.StringDataEntry;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.TimePageLink;
@@ -273,7 +275,7 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
 
         Tenant tenant = new Tenant();
         tenant.setTitle(TEST_TENANT_NAME);
-        Tenant savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        Tenant savedTenant = createTenant(tenant);
         Assert.assertNotNull(savedTenant);
         tenantId = savedTenant.getId();
         tenantProfileId = savedTenant.getTenantProfileId();
@@ -367,6 +369,8 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
                 throw new RuntimeException(e);
             }
         }
+        Awaitility.await("tenant cleanup finish").atMost(30, TimeUnit.SECONDS)
+                .until(() -> tsService.findLatest(TenantId.SYS_TENANT_ID, tenantId, "test").get().isEmpty());
     }
 
     private List<Tenant> getAllTenants() throws Exception {
@@ -419,7 +423,7 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
         loginSysAdmin();
         Tenant tenant = new Tenant();
         tenant.setTitle(TEST_DIFFERENT_TENANT_NAME);
-        savedDifferentTenant = doPost("/api/tenant", tenant, Tenant.class);
+        savedDifferentTenant = createTenant(tenant);
         differentTenantId = savedDifferentTenant.getId();
         Assert.assertNotNull(savedDifferentTenant);
         User differentTenantAdmin = new User();
@@ -429,6 +433,12 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
         savedDifferentTenantUser = createUserAndLogin(differentTenantAdmin, DIFFERENT_TENANT_ADMIN_PASSWORD);
     }
 
+    protected Tenant createTenant(Tenant tenant) throws Exception {
+        tenant = doPost("/api/tenant", tenant, Tenant.class);
+        tsService.save(TenantId.SYS_TENANT_ID, tenant.getId(), new BasicTsKvEntry(System.currentTimeMillis(), new StringDataEntry("test", "test"))).get(); // creating marker ts to later know when Housekeeper finishes tenant cleanup
+        return tenant;
+    }
+
     protected void loginDifferentCustomer() throws Exception {
         if (savedDifferentCustomer != null) {
             login(savedDifferentCustomer.getEmail(), CUSTOMER_USER_PASSWORD);

application/src/test/java/org/thingsboard/server/service/housekeeper/HousekeeperServiceTest.java

@@ -99,7 +99,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 @DaoSqlTest
 @TestPropertySource(properties = {
-        "queue.core.housekeeper.enabled=true",
         "transport.http.enabled=true",
         "queue.core.housekeeper.reprocessing-start-delay-sec=1",
         "queue.core.housekeeper.task-reprocessing-delay-sec=2",

application/src/test/resources/application-test.properties

@@ -54,4 +54,3 @@ sql.edge_events.partition_size=168
 sql.ttl.edge_events.edge_event_ttl=2592000
 
 server.log_controller_error_stack_trace=false
-queue.core.housekeeper.enabled=false