Skip to content
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

Jump to bottom

Disable Flaky tests - permissioning #7256

Merged
merged 8 commits into from
Jun 27, 2024
Merged

Disable Flaky tests - permissioning #7256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
769ecd7
disable some flaky tests
macfarla Jun 25, 2024
1517643
correct name for test
macfarla Jun 25, 2024
7dd47e7
Merge branch 'main' of github.com:hyperledger/besu into flaky-test-pe…
macfarla Jun 25, 2024
d8e99d8
formatting
macfarla Jun 25, 2024
1102a5b
Merge branch 'main' of github.com:hyperledger/besu into flaky-test-pe…
macfarla Jun 25, 2024
8bc6941
disable some flaky tests
macfarla Jun 25, 2024
b42b7d3
Merge branch 'main' into flaky-test-permissioning
usmansaleem Jun 27, 2024
68dc2aa
Merge branch 'main' into flaky-test-permissioning
usmansaleem Jun 27, 2024
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
2 changes: 2 additions & 0 deletions ...ger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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));
Expand Down
2 changes: 2 additions & 0 deletions ...r/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2AcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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));
Expand Down
8 changes: 2 additions & 6 deletions ...esu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2DNSAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -57,12 +59,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));
Comment on lines -62 to -65
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does removing this make any difference with the test disabled?

}

@Test
Expand Down
2 changes: 1 addition & 1 deletion ...t/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading