Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(153)

Unified Diff: LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-before-src.html

Issue 634243005: Improve reliability of EME tests (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Update comments Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-before-src.html
diff --git a/LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-before-src.html b/LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-before-src.html
index 036b48ddf250819ea18b7e7a4d48542a54140c6b..3b8610aafe8022d63f4d13016fd62deb7b95cfdb 100644
--- a/LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-before-src.html
+++ b/LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-before-src.html
@@ -14,8 +14,8 @@
async_test(function(test)
{
var video = document.getElementById('testVideo');
- var isSessionCreated = false;
var isUpdatePromiseResolved = false;
+ var encryptedEventCount = 0;
var rawKey = new Uint8Array([0xeb, 0xdd, 0x62, 0xf1, 0x68, 0x14, 0xd2, 0x7b,
0x68, 0xef, 0x12, 0x2a, 0xfc, 0xe4, 0xae, 0x3c]);
@@ -26,10 +26,14 @@
assert_true(event instanceof window.MediaEncryptedEvent);
assert_equals(event.type, 'encrypted');
- // The same decryption key is shared by all streams so only create a shared session once.
- if (isSessionCreated)
+ // The same decryption key is used by both the audio and
+ // the video streams so only create a session once. To
+ // avoid issues when comparing the expected.txt file
+ // (which logs the events in the order they occur), create
+ // the session on the second event. This also ensures we
+ // see both events.
+ if (++encryptedEventCount != 2)
return;
- isSessionCreated = true;
var mediaKeySession = video.mediaKeys.createSession();
waitForEventAndRunStep('message', mediaKeySession, onMessage, test);

Powered by Google App Engine
This is Rietveld 408576698