Extended the wait logic

eth/sync_test.go

@@ -88,17 +88,23 @@ func testSnapSyncDisabling(t *testing.T, ethVer uint, snapVer uint) {
 	if err := empty.handler.downloader.BeaconSync(ethconfig.SnapSync, full.chain.CurrentBlock(), nil); err != nil {
 		t.Fatal("sync failed:", err)
 	}
-	// Downloader internally has to wait for a timer (3s) to be expired before
+	// Instead of relying on a fixed sleep, poll for the flag within a generous deadline
-	// exiting. Poll after to determine if sync is disabled.
+	// to accommodate slow CI runners
-	time.Sleep(time.Second * 3)
+	checkTicker := time.NewTicker(100 * time.Millisecond)
-	for timeout := time.After(time.Second); ; {
+	defer checkTicker.Stop()
-		select {
+
-		case <-timeout:
+	checkDeadline := time.NewTimer(6 * time.Second)
-			t.Fatalf("snap sync not disabled after successful synchronisation")
+	defer checkDeadline.Stop()
-		case <-time.After(100 * time.Millisecond):
+
+	for {
 		if !empty.handler.snapSync.Load() {
 			return
 		}
+		select {
+		case <-checkTicker.C:
+			continue
+		case <-checkDeadline.C:
+			t.Fatalf("snap sync not disabled after successful synchronisation")
 		}
 	}
 }