[v15] Fix rare TestResumption deadlock

lib/resumption/client.go

@@ -219,6 +219,12 @@ func runClientResumableUnlocking(ctx context.Context, resumableConn *Conn, first
 		case <-detached:
 		}
 
+		reconnectTicker.Stop()
+		select {
+		case <-reconnectTicker.Chan():
+		default:
+		}
+
 		slog.DebugContext(ctx, "connection lost, starting reconnection loop", "host_id", hostID)
 		reconnectDeadline := time.Now().Add(reconnectTimeout)
 		backoff := minBackoff
@@ -262,10 +268,6 @@ func runClientResumableUnlocking(ctx context.Context, resumableConn *Conn, first
 		}
 
 		reconnectTicker.Reset(replacementInterval)
-		select {
-		case <-reconnectTicker.Chan():
-		default:
-		}
 	}
 }
 

lib/resumption/resumption_test.go

@@ -212,6 +212,9 @@ func testResumption(t *testing.T, network, address string, expectedHostID string
 		default:
 		}
 
+		// wait until the reconnection loop has passed the reconnection phase
+		// and is waiting on the reconnection timer again
+		clock.BlockUntil(1)
 		clock.Advance(replacementInterval)
 		redialingSyncPoint <- struct{}{}