Skip to content

Commit 0fd8e9a

Browse files
authored
chore(test): add test timeout (#2410)
Signed-off-by: Robin Han <[email protected]>
1 parent 3d05c55 commit 0fd8e9a

26 files changed

+108
-85
lines changed

automq-shell/src/test/java/com/automq/shell/util/UtilsTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@
1616
import org.junit.jupiter.api.Assertions;
1717
import org.junit.jupiter.api.Tag;
1818
import org.junit.jupiter.api.Test;
19+
import org.junit.jupiter.api.Timeout;
1920

2021
import io.netty.buffer.ByteBuf;
2122

23+
@Timeout(60)
2224
@Tag("S3Unit")
2325
public class UtilsTest {
2426

core/src/test/java/kafka/autobalancer/ControllerActionExecutorServiceTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,14 @@
3131

3232
import org.junit.jupiter.api.Tag;
3333
import org.junit.jupiter.api.Test;
34+
import org.junit.jupiter.api.Timeout;
3435
import org.mockito.ArgumentCaptor;
3536
import org.mockito.Mockito;
3637

3738
import java.util.List;
3839
import java.util.concurrent.CompletableFuture;
3940

41+
@Timeout(60)
4042
@Tag("S3Unit")
4143
public class ControllerActionExecutorServiceTest {
4244

core/src/test/java/kafka/autobalancer/goals/GoalTestBase.java

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.apache.kafka.common.TopicPartition;
2727

2828
import org.junit.jupiter.api.Tag;
29+
import org.junit.jupiter.api.Timeout;
2930

3031
import java.util.Collection;
3132
import java.util.HashMap;
@@ -36,6 +37,7 @@
3637
import static kafka.autobalancer.common.types.Resource.NW_IN;
3738
import static kafka.autobalancer.common.types.Resource.NW_OUT;
3839

40+
@Timeout(60)
3941
@Tag("S3Unit")
4042
public class GoalTestBase {
4143
private final Map<String, Goal> goalMap = new HashMap<>();

core/src/test/java/kafka/autobalancer/goals/ResourceUsageDistributionGoalTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.junit.jupiter.api.Disabled;
3333
import org.junit.jupiter.api.Tag;
3434
import org.junit.jupiter.api.Test;
35+
import org.junit.jupiter.api.Timeout;
3536
import org.junit.jupiter.params.ParameterizedTest;
3637
import org.junit.jupiter.params.provider.ValueSource;
3738

@@ -45,6 +46,7 @@
4546
import static kafka.autobalancer.common.types.Resource.NW_IN;
4647
import static kafka.autobalancer.common.types.Resource.NW_OUT;
4748

49+
@Timeout(60)
4850
@Tag("S3Unit")
4951
public class ResourceUsageDistributionGoalTest extends GoalTestBase {
5052

core/src/test/java/kafka/autobalancer/metricsreporter/AutoBalancerMetricsReporterTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@
2525
import org.junit.jupiter.api.Assertions;
2626
import org.junit.jupiter.api.Tag;
2727
import org.junit.jupiter.api.Test;
28+
import org.junit.jupiter.api.Timeout;
2829
import org.mockito.Mockito;
2930

3031
import java.util.HashMap;
3132
import java.util.Map;
3233

34+
@Timeout(60)
3335
@Tag("S3Unit")
3436
public class AutoBalancerMetricsReporterTest {
3537

core/src/test/java/kafka/autobalancer/metricsreporter/metric/MetricSerdeTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@
2323

2424
import org.junit.jupiter.api.Tag;
2525
import org.junit.jupiter.api.Test;
26+
import org.junit.jupiter.api.Timeout;
2627

2728
import java.util.Map;
2829

2930
import static org.junit.jupiter.api.Assertions.assertEquals;
3031
import static org.junit.jupiter.api.Assertions.assertNotNull;
3132
import static org.junit.jupiter.api.Assertions.assertTrue;
3233

34+
@Timeout(60)
3335
@Tag("S3Unit")
3436
public class MetricSerdeTest {
3537
private static final long TIME = 123L;

core/src/test/java/kafka/autobalancer/metricsreporter/metric/MetricsUtilsTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@
2626
import org.junit.jupiter.api.Assertions;
2727
import org.junit.jupiter.api.Tag;
2828
import org.junit.jupiter.api.Test;
29+
import org.junit.jupiter.api.Timeout;
2930

3031
import java.util.Collections;
3132
import java.util.Map;
3233

34+
@Timeout(60)
3335
@Tag("S3Unit")
3436
public class MetricsUtilsTest {
3537

core/src/test/java/kafka/autobalancer/model/ClusterModelTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,14 @@
3737
import org.junit.jupiter.api.Assertions;
3838
import org.junit.jupiter.api.Tag;
3939
import org.junit.jupiter.api.Test;
40+
import org.junit.jupiter.api.Timeout;
4041

4142
import java.util.Collection;
4243
import java.util.Collections;
4344
import java.util.Map;
4445
import java.util.Set;
4546

47+
@Timeout(60)
4648
@Tag("S3Unit")
4749
public class ClusterModelTest {
4850

core/src/test/java/kafka/log/streamaspect/ElasticLogSegmentManagerTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
import org.junit.jupiter.api.Tag;
1515
import org.junit.jupiter.api.Test;
16+
import org.junit.jupiter.api.Timeout;
1617

1718
import java.util.HashSet;
1819
import java.util.Set;
@@ -31,6 +32,7 @@
3132
import static org.mockito.Mockito.verify;
3233
import static org.mockito.Mockito.when;
3334

35+
@Timeout(60)
3436
@Tag("S3Unit")
3537
public class ElasticLogSegmentManagerTest {
3638
@Test

core/src/test/java/kafka/log/streamaspect/ElasticTimeIndexTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@
2020
import org.junit.jupiter.api.Assertions;
2121
import org.junit.jupiter.api.Tag;
2222
import org.junit.jupiter.api.Test;
23+
import org.junit.jupiter.api.Timeout;
2324

2425
import java.io.IOException;
2526
import java.util.List;
2627

2728
import static org.junit.jupiter.api.Assertions.assertEquals;
2829

2930
// TODO: replace S3Unit to AutoMQ
31+
@Timeout(60)
3032
@Tag("S3Unit")
3133
public class ElasticTimeIndexTest {
3234
int maxEntries = 30;

core/src/test/java/kafka/log/streamaspect/ElasticTransactionIndexTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.junit.jupiter.api.Assertions;
2121
import org.junit.jupiter.api.Tag;
2222
import org.junit.jupiter.api.Test;
23+
import org.junit.jupiter.api.Timeout;
2324

2425
import java.io.File;
2526
import java.io.IOException;
@@ -28,6 +29,7 @@
2829

2930
import static org.junit.jupiter.api.Assertions.assertEquals;
3031

32+
@Timeout(60)
3133
@Tag("S3Unit")
3234
public class ElasticTransactionIndexTest {
3335
@Test

core/src/test/java/kafka/log/streamaspect/PartitionStatusTrackerTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@
1616

1717
import org.junit.jupiter.api.Tag;
1818
import org.junit.jupiter.api.Test;
19+
import org.junit.jupiter.api.Timeout;
1920

2021
import static org.junit.jupiter.api.Assertions.assertEquals;
2122

23+
@Timeout(60)
2224
@Tag("S3Unit")
2325
public class PartitionStatusTrackerTest {
2426

core/src/test/java/kafka/log/streamaspect/cache/FileCacheTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.junit.jupiter.api.Assertions;
2121
import org.junit.jupiter.api.Tag;
2222
import org.junit.jupiter.api.Test;
23+
import org.junit.jupiter.api.Timeout;
2324

2425
import java.io.IOException;
2526
import java.util.Arrays;
@@ -32,6 +33,7 @@
3233
import static org.junit.jupiter.api.Assertions.assertEquals;
3334
import static org.junit.jupiter.api.Assertions.assertTrue;
3435

36+
@Timeout(60)
3537
@Tag("S3Unit")
3638
public class FileCacheTest {
3739

core/src/test/scala/kafka/log/streamaspect/ElasticLogCleanerTest.scala

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import java.io.File
1414
import java.util.Properties
1515
import scala.jdk.CollectionConverters.CollectionHasAsScala
1616

17+
@Timeout(60)
1718
@Tag("S3Unit")
1819
class ElasticLogCleanerTest extends LogCleanerTest {
1920
var client: Client = _

core/src/test/scala/kafka/log/streamaspect/ElasticLogTest.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import org.apache.kafka.coordinator.transaction.TransactionLogConfigs
2424
import org.apache.kafka.server.util.{MockTime, Scheduler}
2525
import org.apache.kafka.storage.internals.log._
2626
import org.junit.jupiter.api.Assertions._
27-
import org.junit.jupiter.api.{AfterEach, BeforeEach, Tag, Test}
27+
import org.junit.jupiter.api.{AfterEach, BeforeEach, Tag, Test, Timeout}
2828

2929
import java.io.{File, IOException}
3030
import java.nio.charset.StandardCharsets
@@ -33,6 +33,7 @@ import java.util.regex.Pattern
3333
import scala.jdk.CollectionConverters.IterableHasAsScala
3434

3535
// TODO: extends the LocalLogTest
36+
@Timeout(60)
3637
@Tag("S3Unit")
3738
class ElasticLogTest {
3839
val kafkaConfig: KafkaConfig = KafkaConfig.fromProps(TestUtils.createBrokerConfig(0, "127.0.0.1:1", port = -1))

core/src/test/scala/kafka/log/streamaspect/ElasticProducerStateManagerTest.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@ import org.apache.kafka.common.utils.{MockTime, Utils}
2020
import org.apache.kafka.coordinator.transaction.TransactionLogConfigs
2121
import org.apache.kafka.storage.internals.log._
2222
import org.junit.jupiter.api.Assertions._
23-
import org.junit.jupiter.api.{AfterEach, BeforeEach, Tag, Test}
23+
import org.junit.jupiter.api.{AfterEach, BeforeEach, Tag, Test, Timeout}
2424
import org.junit.jupiter.params.ParameterizedTest
2525
import org.junit.jupiter.params.provider.ValueSource
2626
import org.mockito.Mockito.{mock, when}
27-
2827
import kafka.log.streamaspect.ElasticProducerStateManager.AWAIT_SEQ_ZERO_TIMEOUT
2928

3029
import java.io.File
@@ -36,6 +35,7 @@ import java.util.{Collections, Optional, OptionalLong}
3635
import scala.compat.java8.OptionConverters.RichOptionalGeneric
3736
import scala.jdk.CollectionConverters._
3837

38+
@Timeout(60)
3939
@Tag("S3Unit")
4040
class ElasticProducerStateManagerTest {
4141

core/src/test/scala/kafka/log/streamaspect/ElasticUnifiedLogTest.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,15 @@ import org.apache.kafka.server.util.Scheduler
2525
import org.apache.kafka.storage.internals.log._
2626
import org.apache.kafka.storage.internals.utils.Throttler
2727
import org.junit.jupiter.api.Assertions._
28-
import org.junit.jupiter.api.{BeforeEach, Tag, Test}
28+
import org.junit.jupiter.api.{BeforeEach, Tag, Test, Timeout}
2929
import org.junit.jupiter.params.ParameterizedTest
3030
import org.junit.jupiter.params.provider.ValueSource
3131

3232
import java.io.File
3333
import java.util.Optional
3434
import scala.jdk.CollectionConverters.IterableHasAsScala
3535

36+
@Timeout(60)
3637
@Tag("S3Unit")
3738
class ElasticUnifiedLogTest extends UnifiedLogTest {
3839
var client: Client = _

core/src/test/scala/unit/kafka/server/BrokerQuotaManagerTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.junit.jupiter.api.BeforeEach;
3030
import org.junit.jupiter.api.Tag;
3131
import org.junit.jupiter.api.Test;
32+
import org.junit.jupiter.api.Timeout;
3233

3334
import java.util.Properties;
3435
import java.util.concurrent.TimeUnit;
@@ -41,6 +42,7 @@
4142
import static org.mockito.Mockito.mock;
4243
import static org.mockito.Mockito.when;
4344

45+
@Timeout(60)
4446
@Tag("s3Unit")
4547
public class BrokerQuotaManagerTest {
4648
private final Time time = Time.SYSTEM;

core/src/test/scala/unit/kafka/server/ControllerConfigurationValidatorTableTest.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ import org.apache.kafka.common.config.TopicConfig.TABLE_TOPIC_SCHEMA_TYPE_CONFIG
1818
import org.apache.kafka.common.errors.InvalidConfigurationException
1919
import org.apache.kafka.server.record.TableTopicSchemaType
2020
import org.junit.jupiter.api.Assertions.{assertEquals, assertThrows}
21-
import org.junit.jupiter.api.{Tag, Test}
21+
import org.junit.jupiter.api.{Tag, Test, Timeout}
2222

2323
import java.util
2424

25+
@Timeout(60)
2526
@Tag("S3Unit")
2627
class ControllerConfigurationValidatorTableTest {
2728
val config = new KafkaConfig(TestUtils.createDummyBrokerConfig())

core/src/test/scala/unit/kafka/server/streamaspect/ElasticControllerApisTest.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ import org.apache.kafka.raft.QuorumConfig
99
import org.apache.kafka.server.authorizer.Authorizer
1010
import org.apache.kafka.server.common.{FinalizedFeatures, MetadataVersion}
1111
import org.apache.kafka.server.config.KRaftConfigs
12-
import org.junit.jupiter.api.Tag
12+
import org.junit.jupiter.api.{Tag, Timeout}
1313

1414
import java.util.Properties
1515

16+
@Timeout(60)
1617
@Tag("S3Unit")
1718
class ElasticControllerApisTest extends ControllerApisTest {
1819

core/src/test/scala/unit/kafka/server/streamaspect/ElasticKafkaApisTest.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ import org.apache.kafka.raft.QuorumConfig
1111
import org.apache.kafka.server.authorizer.Authorizer
1212
import org.apache.kafka.server.common.{FinalizedFeatures, MetadataVersion}
1313
import org.apache.kafka.server.config.KRaftConfigs
14-
import org.junit.jupiter.api.Tag
14+
import org.junit.jupiter.api.{Tag, Timeout}
1515
import org.mockito.Mockito.mock
1616

1717
import java.util.Collections
1818
import scala.collection.Map
1919
import scala.jdk.CollectionConverters.SetHasAsScala
2020

21+
@Timeout(60)
2122
@Tag("S3Unit")
2223
class ElasticKafkaApisTest extends KafkaApisTest {
2324
override protected val replicaManager: ElasticReplicaManager = mock(classOf[ElasticReplicaManager])

0 commit comments

Comments
 (0)