Merge branch 'main' into Fix_DebugTraceCall

hyperledger · Sep 13, 2024 · 17d21eb · 17d21eb
2 parents 1ca8f43 + 31c174b
commit 17d21eb
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/TxPoolOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/TxPoolOptionsTest.java
@@ -30,6 +30,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 public class TxPoolOptionsTest extends CommandTestAbstract {
@@ -97,6 +98,7 @@ public void txpoolSaveFileAbsolutePathOutsideDataPath() throws IOException {
   }
 
   @Test
+  @Disabled // Failing in CI, but not locally
   public void txpoolForcePriceBumpToZeroWhenZeroBaseFeeMarket() throws IOException {
     final Path genesisFile = createFakeGenesisFile(GENESIS_WITH_ZERO_BASE_FEE_MARKET);
     parseCommand("--genesis-file", genesisFile.toString());