test(taiko-client): upgrade full sync and snap sync hive tests (#18010)

taikoxyz · Sep 14, 2024 · 1d18c17 · 1d18c17
1 parent f877568
commit 1d18c17
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/repo--merge-gatekeeper.yml b/.github/workflows/repo--merge-gatekeeper.yml
@@ -17,4 +17,5 @@ jobs:
       - name: Run Merge Gatekeeper
         uses: upsidr/merge-gatekeeper@v1
         with:
+          timeout: 1200
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/packages/taiko-client/integration_test/hive_test.go b/packages/taiko-client/integration_test/hive_test.go
@@ -34,27 +34,25 @@ func TestHiveHandler(t *testing.T) {
 		},
 	}
 
-	// Single cluster test.
-	t.Run("taiko-genesis/l2-full-sync/clusters(1)", func(t *testing.T) {
-		testDenebGenesis(t, "taiko-genesis/l2-full-sync", [][]string{clientGroups[0]})
-	})
-	t.Run("taiko-reorg/l2-full-sync/clusters(1)", func(t *testing.T) {
-		testDenebReorg(t, "taiko-reorg/l2-full-sync", [][]string{clientGroups[0]})
-	})
-
-	// Multi clusters test.
+	// Multi clusters full sync and snap sync tests.
 	t.Run(fmt.Sprintf("taiko-genesis/l2-snap-sync/clusters(%d)", len(clientGroups)), func(t *testing.T) {
 		testDenebGenesis(t, "taiko-genesis/l2-snap-sync", clientGroups)
 	})
-	t.Run(fmt.Sprintf("taiko-reorg/l2-snap-sync/clusters(%d)", len(clientGroups)), func(t *testing.T) {
-		testDenebReorg(t, "taiko-reorg/l2-snap-sync", clientGroups)
+	t.Run(fmt.Sprintf("taiko-genesis/l2-full-sync/clusters(%d)", len(clientGroups)), func(t *testing.T) {
+		testDenebGenesis(t, "taiko-genesis/l2-full-sync", clientGroups)
+	})
+
+	// Multi clusters reorg test.
+	t.Run("taiko-reorg/taiko-reorg/clusters(1)", func(t *testing.T) {
+		testDenebReorg(t, "taiko-reorg/taiko-reorg", [][]string{clientGroups[0]})
 	})
 }
 
 func testDenebGenesis(t *testing.T, simPattern string, clientGroups [][]string) {
 	handler, err := hivesim.NewHiveFramework(&hivesim.HiveConfig{
 		BuildOutput:     false,
 		ContainerOutput: true,
+		DockerPull:      true,
 		BaseDir:         os.Getenv("HIVE_DIR"),
 		SimPattern:      "taiko",
 		SimTestPattern:  simPattern,