sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-19 13:35:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

De-flake new test for ProgressiveMediaSource.suppressPrepareError

Browse source 
This test was added in b3290eff10

#cherrypick

PiperOrigin-RevId: 686918104
This commit is contained in:
ibaker 2024-10-17 08:08:42 -07:00 committed by Copybara-Service
parent 49dec5db8b
commit 64e0397811
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/ProgressiveMediaSourceTest.java
View file

@ -19,6 +19,7 @@ import static androidx.media3.test.utils.robolectric.RobolectricUtil.DEFAULT_TIM
import static com.google.common.truth.Truth.assertThat;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import android.os.SystemClock;
import androidx.annotation.Nullable;
import androidx.media3.common.MediaItem;
import androidx.media3.common.Timeline;
@ -154,16 +155,24 @@ public class ProgressiveMediaSourceTest {
CountDownLatch preparedLatch =
mediaSourceTestRunner.preparePeriod(mediaPeriod, /* positionUs= */ 0);
assertThat(loadErrorReported.await(DEFAULT_TIMEOUT_MS, MILLISECONDS)).isTrue();
AtomicReference<Throwable> prepareError = new AtomicReference<>();
mediaSourceTestRunner.runOnPlaybackThread(
() -> {
try {
mediaPeriod.maybeThrowPrepareError();
} catch (Throwable e) {
prepareError.set(e);
}
});
assertThat(prepareError.get()).isNull();
// Call maybeThrowPrepareError() in a loop until preparation completes (preparation is not
// unblocked until the error is caught and suppressed inside maybeThrowPrepareError()). This
// mimics the behaviour of ExoPlayerImplInternal which calls maybeThrowPrepareError() on
// un-prepared MediaPeriods on every doSomeWork() iteration.
long startTime = SystemClock.elapsedRealtime();
do {
AtomicReference<Throwable> prepareError = new AtomicReference<>();
mediaSourceTestRunner.runOnPlaybackThread(
() -> {
try {
mediaPeriod.maybeThrowPrepareError();
} catch (Throwable e) {
prepareError.set(e);
}
});
assertThat(prepareError.get()).isNull();
} while (preparedLatch.getCount() > 0
&& (SystemClock.elapsedRealtime() - startTime) < DEFAULT_TIMEOUT_MS);
assertThat(preparedLatch.await(DEFAULT_TIMEOUT_MS, MILLISECONDS)).isTrue();
mediaSourceTestRunner.releasePeriod(mediaPeriod);