Browse Source

Fix testSubmitJob_allTasksSuccessful for entity partitioning strategy

pull/14264/head
Viacheslav Klimov 11 months ago
parent
commit
b71b50c1db
  1. 2
      application/src/test/java/org/thingsboard/server/service/job/JobManagerTest.java
  2. 9
      application/src/test/java/org/thingsboard/server/service/job/JobManagerTest_EntityPartitioningStrategy.java

2
application/src/test/java/org/thingsboard/server/service/job/JobManagerTest.java

@ -98,7 +98,7 @@ public class JobManagerTest extends AbstractControllerTest {
await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> { await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
Job job = findJobById(jobId); Job job = findJobById(jobId);
assertThat(job.getStatus()).isEqualTo(JobStatus.RUNNING); assertThat(job.getStatus()).isEqualTo(JobStatus.RUNNING);
assertThat(job.getResult().getSuccessfulCount()).isBetween(1, tasksCount - 1); assertThat(job.getResult().getSuccessfulCount()).isBetween(0, tasksCount - 1);
assertThat(job.getResult().getTotalCount()).isEqualTo(tasksCount); assertThat(job.getResult().getTotalCount()).isEqualTo(tasksCount);
}); });
await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> { await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {

9
application/src/test/java/org/thingsboard/server/service/job/JobManagerTest_EntityPartitioningStrategy.java

@ -27,17 +27,16 @@ import org.thingsboard.server.dao.service.DaoSqlTest;
public class JobManagerTest_EntityPartitioningStrategy extends JobManagerTest { public class JobManagerTest_EntityPartitioningStrategy extends JobManagerTest {
/* /*
* Some tests are overridden because they are based on * Some tests are overridden because they are based on
* tenant partitioning strategy (subsequent tasks processing within a tenant) * tenant partitioning strategy (subsequent tasks processing within a tenant)
* */ * */
@Override @Override
public void testCancelJob_simulateTaskProcessorRestart() throws Exception { public void testCancelJob_simulateTaskProcessorRestart() {
} }
@Override @Override
public void testSubmitJob_generalError() { public void testSubmitJob_generalError() {
} }
} }

Loading…
Cancel
Save