loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix flaky DRM assertion in AnalyticsCollectorTest

Browse Source 
Session pre-fetching caused this ordering assertion to no longer be
always true. It should have been removed in
795ddfee40

#minor-release

PiperOrigin-RevId: 370880530
This commit is contained in:
ibaker 2021-04-28 13:23:44 +01:00 committed by bachinger
parent 688fd73d39
commit e2024072ef
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
View File

@ -1504,9 +1504,9 @@ public final class AnalyticsCollectorTest {
assertThat(listener.getEvents(EVENT_DRM_SESSION_ACQUIRED)) assertThat(listener.getEvents(EVENT_DRM_SESSION_ACQUIRED))
.containsExactly(period0, period1) .containsExactly(period0, period1)
.inOrder(); .inOrder();
assertThat(listener.getEvents(EVENT_DRM_KEYS_LOADED)) // The pre-fetched key load for period1 might complete before the blocking key load for period0,
.containsExactly(period0, period1) // so we can't assert the order:
.inOrder(); assertThat(listener.getEvents(EVENT_DRM_KEYS_LOADED)).containsExactly(period0, period1);
// The period1 release event is lost because it's posted to "ExoPlayerTest thread" after that // The period1 release event is lost because it's posted to "ExoPlayerTest thread" after that
// thread has been quit during clean-up. // thread has been quit during clean-up.
assertThat(listener.getEvents(EVENT_DRM_SESSION_RELEASED)).containsExactly(period0); assertThat(listener.getEvents(EVENT_DRM_SESSION_RELEASED)).containsExactly(period0);