From 9073c2b28dd06ffb31fd7e930ed39d3ca13aba56 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Thu, 8 May 2025 05:57:57 -0700
Subject: [PATCH] Deflake ExoPlayerScrubbingTest

Instead of waiting for pending commands to complete as a proxy for
'the requested seek(s) completed', we wait until the corresponding
playback position.

PiperOrigin-RevId: 756276867
---
 .../androidx/media3/exoplayer/ExoPlayerScrubbingTest.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerScrubbingTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerScrubbingTest.java
index 7bf3938a9d..942a8dd0f2 100644
--- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerScrubbingTest.java
+++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerScrubbingTest.java
@@ -135,14 +135,14 @@ public final class ExoPlayerScrubbingTest {
     player.seekTo(3000);
     player.seekTo(3500);
     // Allow the 2500 and 3500 seeks to complete (the 3000 seek should be dropped).
-    advance(player).untilPendingCommandsAreFullyHandled();
+    advance(player).untilPosition(/* mediaItemIndex= */ 0, /* positionMs= */ 3500);
 
     player.seekTo(4000);
     player.seekTo(4500);
     // Disabling scrubbing mode should immediately execute the last received seek (pre-empting a
     // previous one), so we expect the 4500 seek to be resolved and the 4000 seek to be dropped.
     player.setScrubbingModeEnabled(false);
-    advance(player).untilPendingCommandsAreFullyHandled();
+    advance(player).untilPosition(/* mediaItemIndex= */ 0, /* positionMs= */ 4500);
     player.clearVideoFrameMetadataListener(mockVideoFrameMetadataListener);
     advance(player).untilState(Player.STATE_ENDED);
     player.release();