Skip to content

test(grpc): mitigate GRPC test hangs with timeout rule #6460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 29, 2025
Merged

test(grpc): mitigate GRPC test hangs with timeout rule #6460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions framework/src/test/java/org/tron/core/services/RpcApiServicesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,16 @@
import io.grpc.ManagedChannelBuilder;
import java.io.IOException;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.FixMethodOrder;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.Timeout;
import org.junit.runners.MethodSorters;
import org.tron.api.DatabaseGrpc;
import org.tron.api.DatabaseGrpc.DatabaseBlockingStub;
Expand Down Expand Up @@ -125,6 +128,8 @@ public class RpcApiServicesTest {
private static WalletSolidityBlockingStub blockingStubPBFT = null;
@ClassRule
public static TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
public Timeout timeout = new Timeout(30, TimeUnit.SECONDS);
private static ByteString ownerAddress;
private static ByteString sk;
private static ByteString ask;
Expand Down
5 changes: 5 additions & 0 deletions framework/src/test/java/org/tron/core/services/WalletApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.Timeout;
import org.tron.api.GrpcAPI.EmptyMessage;
import org.tron.api.WalletGrpc;
import org.tron.common.application.Application;
Expand All @@ -28,6 +30,9 @@ public class WalletApiTest {
@ClassRule
public static TemporaryFolder temporaryFolder = new TemporaryFolder();

@Rule
public Timeout timeout = new Timeout(30, TimeUnit.SECONDS);

private static TronApplicationContext context;
private static Application appT;

Expand Down
4 changes: 4 additions & 0 deletions framework/src/test/java/org/tron/core/services/filter/LiteFnQueryGrpcInterceptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.Timeout;
import org.tron.api.GrpcAPI;
import org.tron.api.WalletGrpc;
import org.tron.api.WalletSolidityGrpc;
Expand Down Expand Up @@ -47,6 +48,9 @@ public class LiteFnQueryGrpcInterceptorTest {
@ClassRule
public static final TemporaryFolder temporaryFolder = new TemporaryFolder();

@Rule
public Timeout timeout = new Timeout(30, TimeUnit.SECONDS);

/**
* init logic.
*/
Expand Down
5 changes: 5 additions & 0 deletions framework/src/test/java/org/tron/core/services/filter/RpcApiAccessInterceptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.Timeout;
import org.tron.api.GrpcAPI.BlockExtention;
import org.tron.api.GrpcAPI.BlockReq;
import org.tron.api.GrpcAPI.BytesMessage;
Expand Down Expand Up @@ -53,6 +55,9 @@ public class RpcApiAccessInterceptorTest {
@ClassRule
public static final TemporaryFolder temporaryFolder = new TemporaryFolder();

@Rule
public Timeout timeout = new Timeout(30, TimeUnit.SECONDS);

/**
* init logic.
*/
Expand Down
6 changes: 6 additions & 0 deletions framework/src/test/java/org/tron/program/SolidityNodeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;

import java.util.concurrent.TimeUnit;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.Timeout;
import org.tron.common.BaseTest;
import org.tron.common.client.DatabaseGrpcClient;
import org.tron.common.utils.PublicMethod;
Expand All @@ -28,6 +31,9 @@ public class SolidityNodeTest extends BaseTest {
static int rpcPort = PublicMethod.chooseRandomPort();
static int solidityHttpPort = PublicMethod.chooseRandomPort();

@Rule
public Timeout timeout = new Timeout(30, TimeUnit.SECONDS);

static {
Args.setParam(new String[] {"-d", dbPath(), "--solidity"}, Constant.TEST_CONF);
Args.getInstance().setRpcPort(rpcPort);
Expand Down