disable test again

StefanBratanov · Nov 13, 2023 · b4a7483 · b4a7483
1 parent f9d59fe
commit b4a7483
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 60 deletions.
diff --git a/.../acceptance-test/java/tech/pegasys/teku/test/acceptance/CapellaUpgradeAcceptanceTest.java b/.../acceptance-test/java/tech/pegasys/teku/test/acceptance/CapellaUpgradeAcceptanceTest.java
@@ -16,6 +16,7 @@
 import com.google.common.io.Resources;
 import java.net.URL;
 import java.util.Map;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import tech.pegasys.teku.infrastructure.time.SystemTimeProvider;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
@@ -38,23 +39,22 @@ public class CapellaUpgradeAcceptanceTest extends AcceptanceTestBase {
   private static final URL JWT_FILE = Resources.getResource("auth/ee-jwt-secret.hex");
 
   @Test
+  @Disabled("Switch to shanghaiBlock Besu genesis when it's available and enable")
   void shouldUpgradeToCapella() throws Exception {
     final UInt64 currentTime = timeProvider.getTimeInSeconds();
     final int genesisTime = currentTime.plus(30).intValue(); // magic node startup time
     final int shanghaiTime = genesisTime + 4 * 2; // 4 slots, 2 seconds each
-    final Map<String, String> genesisOverrides =
-        Map.of("shanghaiTime", String.valueOf(shanghaiTime));
 
     BesuNode primaryEL =
         createBesuNode(
             BesuDockerVersion.STABLE,
             config ->
                 config
                     .withMergeSupport(true)
-                    .withGenesisFile("besu/shanghaiGenesis.json")
+                    .withGenesisFile("besu/mergedGenesis.json")
                     .withP2pEnabled(true)
                     .withJwtTokenAuthorization(JWT_FILE),
-            genesisOverrides);
+            Map.of("shanghaiTime", String.valueOf(shanghaiTime)));
     primaryEL.start();
 
     BesuNode secondaryEL =
@@ -63,10 +63,10 @@ void shouldUpgradeToCapella() throws Exception {
             config ->
                 config
                     .withMergeSupport(true)
-                    .withGenesisFile("besu/shanghaiGenesis.json")
+                    .withGenesisFile("besu/mergedGenesis.json")
                     .withP2pEnabled(true)
                     .withJwtTokenAuthorization(JWT_FILE),
-            genesisOverrides);
+            Map.of("shanghaiTime", String.valueOf(shanghaiTime)));
     secondaryEL.start();
     secondaryEL.addPeer(primaryEL);
 

diff --git a/acceptance-tests/src/testFixtures/resources/besu/shanghaiGenesis.json b/acceptance-tests/src/testFixtures/resources/besu/shanghaiGenesis.json