Skip to content

Commit feee7ad

Browse files
authored
specify test timeout in properties (#367)
1 parent f65bc1b commit feee7ad

51 files changed

Lines changed: 4 additions & 53 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

transact-cli/src/test/java/dev/dbos/transact/cli/MigrateCommandTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.junit.jupiter.params.provider.ValueSource;
2020
import picocli.CommandLine;
2121

22-
@org.junit.jupiter.api.Timeout(value = 2, unit = java.util.concurrent.TimeUnit.MINUTES)
2322
public class MigrateCommandTest {
2423

2524
@AutoClose final PgContainer pgContainer = new PgContainer();

transact-cli/src/test/java/dev/dbos/transact/cli/ResetCommandTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,15 @@
1212
import java.sql.SQLException;
1313
import java.util.Collection;
1414
import java.util.List;
15-
import java.util.concurrent.TimeUnit;
1615
import java.util.stream.Stream;
1716

1817
import org.junit.jupiter.api.AutoClose;
1918
import org.junit.jupiter.api.BeforeEach;
2019
import org.junit.jupiter.api.MethodOrderer;
2120
import org.junit.jupiter.api.Test;
2221
import org.junit.jupiter.api.TestMethodOrder;
23-
import org.junit.jupiter.api.Timeout;
2422
import picocli.CommandLine;
2523

26-
@Timeout(value = 2, unit = TimeUnit.MINUTES)
2724
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
2825
public class ResetCommandTest {
2926

transact-cli/src/test/resources/junit-platform.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ junit.jupiter.execution.parallel.enabled = true
22
junit.jupiter.execution.parallel.mode.default = concurrent
33
junit.jupiter.execution.parallel.mode.classes.default = concurrent
44
junit.jupiter.execution.parallel.config.strategy = dynamic
5-
junit.jupiter.execution.parallel.config.dynamic.factor = 1.0
5+
junit.jupiter.execution.parallel.config.dynamic.factor = 1.0
6+
junit.jupiter.execution.timeout.default = 2 m

transact/src/test/java/dev/dbos/transact/admin/AdminServerTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import org.junit.jupiter.api.Test;
3939
import org.mockito.ArgumentCaptor;
4040

41-
@org.junit.jupiter.api.Timeout(value = 2, unit = java.util.concurrent.TimeUnit.MINUTES)
4241
class AdminServerTest {
4342

4443
int port;

transact/src/test/java/dev/dbos/transact/client/ClientScheduleTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.junit.jupiter.api.BeforeEach;
2020
import org.junit.jupiter.api.Test;
2121

22-
@org.junit.jupiter.api.Timeout(value = 2, unit = java.util.concurrent.TimeUnit.MINUTES)
2322
public class ClientScheduleTest {
2423

2524
@AutoClose final PgContainer pgContainer = new PgContainer();

transact/src/test/java/dev/dbos/transact/client/ClientTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.junit.jupiter.api.*;
2626
import org.junitpioneer.jupiter.RetryingTest;
2727

28-
@org.junit.jupiter.api.Timeout(value = 2, unit = java.util.concurrent.TimeUnit.MINUTES)
2928
public class ClientTest {
3029

3130
@AutoClose final PgContainer pgContainer = new PgContainer();

transact/src/test/java/dev/dbos/transact/client/EnqueueOptionsTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import org.junit.jupiter.api.Test;
1010

11-
@org.junit.jupiter.api.Timeout(value = 2, unit = java.util.concurrent.TimeUnit.MINUTES)
1211
public class EnqueueOptionsTest {
1312
@Test
1413
public void enqueueOptionsValidation() throws Exception {

transact/src/test/java/dev/dbos/transact/client/PgSqlClientTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.junit.jupiter.api.Test;
3333
import org.postgresql.util.PSQLException;
3434

35-
@org.junit.jupiter.api.Timeout(value = 2, unit = java.util.concurrent.TimeUnit.MINUTES)
3635
public class PgSqlClientTest {
3736

3837
private static final ObjectMapper MAPPER = new ObjectMapper();

transact/src/test/java/dev/dbos/transact/client/StreamTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.zaxxer.hikari.HikariDataSource;
2020
import org.junit.jupiter.api.*;
2121

22-
@org.junit.jupiter.api.Timeout(value = 2, unit = java.util.concurrent.TimeUnit.MINUTES)
2322
public class StreamTest {
2423

2524
@AutoClose final PgContainer pgContainer = new PgContainer();

transact/src/test/java/dev/dbos/transact/conductor/ConductorTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
import org.slf4j.Logger;
7878
import org.slf4j.LoggerFactory;
7979

80-
@org.junit.jupiter.api.Timeout(value = 2, unit = java.util.concurrent.TimeUnit.MINUTES)
8180
public class ConductorTest {
8281

8382
private static final Logger logger = LoggerFactory.getLogger(ConductorTest.class);

0 commit comments

Comments
 (0)