From 769ecd758a361ea7e03b67faf2d9185c297fa6cc Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Tue, 25 Jun 2024 11:56:59 +1000 Subject: [PATCH 1/4] disable some flaky tests Signed-off-by: Sally MacFarlane --- .../NodeSmartContractPermissioningAcceptanceTest.java | 2 ++ .../NodeSmartContractPermissioningV2AcceptanceTest.java | 2 ++ .../NodeSmartContractPermissioningV2DNSAcceptanceTest.java | 5 ----- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java index 8f17c78adde..903919c800c 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java +++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java @@ -17,6 +17,7 @@ import org.hyperledger.besu.tests.acceptance.dsl.node.Node; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; public class NodeSmartContractPermissioningAcceptanceTest @@ -57,6 +58,7 @@ public void setUp() { } @Test + @Disabled("test is flaky") public void permissionedNodeShouldPeerOnlyWithAllowedNodes() { bootnode.verify(net.awaitPeerCount(3)); allowedNode.verify(net.awaitPeerCount(3)); diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2AcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2AcceptanceTest.java index 843d14004fc..efb88178d6d 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2AcceptanceTest.java +++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2AcceptanceTest.java @@ -17,6 +17,7 @@ import org.hyperledger.besu.tests.acceptance.dsl.node.Node; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; public class NodeSmartContractPermissioningV2AcceptanceTest @@ -51,6 +52,7 @@ public void setUp() { } @Test + @Disabled("test is flaky") public void permissionedNodeShouldPeerOnlyWithAllowedNodes() { bootnode.verify(net.awaitPeerCount(3)); allowedNode.verify(net.awaitPeerCount(3)); diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2DNSAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2DNSAcceptanceTest.java index 7a55283e4f4..aecae1d6ab2 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2DNSAcceptanceTest.java +++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2DNSAcceptanceTest.java @@ -58,11 +58,6 @@ public void setUp() { permissionedNode.execute(allowNode(permissionedNode)); permissionedNode.verify(connectionIsAllowed(permissionedNode)); - // Verify initial configuration - bootnode.verify(net.awaitPeerCount(3)); - allowedNode.verify(net.awaitPeerCount(3)); - forbiddenNode.verify(net.awaitPeerCount(2)); - permissionedNode.verify(net.awaitPeerCount(2)); } @Test From 151764340b2a2d68a6e8e2287f3a50e632905a78 Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Tue, 25 Jun 2024 12:39:59 +1000 Subject: [PATCH 2/4] correct name for test Signed-off-by: Sally MacFarlane --- .../api/jsonrpc/internal/methods/EthEstimateGasTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java index 98b9226404a..aa52a31c1f9 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java @@ -361,7 +361,7 @@ public void shouldIgnoreSenderBalanceAccountWhenStrictModeDisabled() { } @Test - public void shouldNotIgnoreSenderBalanceAccountWhenStrictModeDisabled() { + public void shouldNotIgnoreSenderBalanceAccountWhenStrictModeEnabled() { final JsonRpcRequestContext request = ethEstimateGasRequest(legacyTransactionCallParameter(Wei.ZERO, true)); mockTransientProcessorResultGasEstimate(1L, false, true); From d8e99d87c5b4843cba8cf830ecb246f8a65c7311 Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Tue, 25 Jun 2024 14:22:19 +1000 Subject: [PATCH 3/4] formatting Signed-off-by: Sally MacFarlane --- .../NodeSmartContractPermissioningV2DNSAcceptanceTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2DNSAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2DNSAcceptanceTest.java index aecae1d6ab2..f5b122f84fd 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2DNSAcceptanceTest.java +++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2DNSAcceptanceTest.java @@ -57,7 +57,6 @@ public void setUp() { permissionedNode.execute(allowNode(permissionedNode)); permissionedNode.verify(connectionIsAllowed(permissionedNode)); - } @Test From 8bc6941d65f6ff6661ad8e64b859355705e0c48e Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Wed, 26 Jun 2024 08:23:32 +1000 Subject: [PATCH 4/4] disable some flaky tests Signed-off-by: Sally MacFarlane --- .../NodeSmartContractPermissioningV2DNSAcceptanceTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2DNSAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2DNSAcceptanceTest.java index f5b122f84fd..435333a7760 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2DNSAcceptanceTest.java +++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2DNSAcceptanceTest.java @@ -25,8 +25,10 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +@Disabled("test is flaky #7191") public class NodeSmartContractPermissioningV2DNSAcceptanceTest extends NodeSmartContractPermissioningV2AcceptanceTestBase {