summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjrummell <jrummell@chromium.org>2015-03-27 17:29:46 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-28 00:30:31 +0000
commitaacbf715042539a5a898fbda504af8faffd299b5 (patch)
tree0c2714cbea0d73f7c48171fd5b4cca08944a7000
parent5fe460ffa7a39f010134cf7c5ca5311f274103e3 (diff)
downloadchromium_src-aacbf715042539a5a898fbda504af8faffd299b5.zip
chromium_src-aacbf715042539a5a898fbda504af8faffd299b5.tar.gz
chromium_src-aacbf715042539a5a898fbda504af8faffd299b5.tar.bz2
Update EME browser_tests to handle early failure
encrypted_media_browsertest.cc checks receivedKeyMessage after the test page completes. However, receivedKeyMessage is never set in failure cases, so the code times out trying to get the value. Setting receivedKeyMessage to false during initialization to avoid this problem. BUG= TEST=manually created test failures cause EME browser_tests to fail Review URL: https://codereview.chromium.org/1034343004 Cr-Commit-Position: refs/heads/master@{#322686}
-rw-r--r--media/test/data/eme_player_js/player_utils.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/test/data/eme_player_js/player_utils.js b/media/test/data/eme_player_js/player_utils.js
index 86a3e0e..d765670 100644
--- a/media/test/data/eme_player_js/player_utils.js
+++ b/media/test/data/eme_player_js/player_utils.js
@@ -84,6 +84,7 @@ PlayerUtils.registerEMEEventListeners = function(player) {
});
this.registerDefaultEventListeners(player);
+ player.video.receivedKeyMessage = false;
Utils.timeLog('Setting video media keys: ' + player.testConfig.keySystem);
var persistentState = player.testConfig.sessionToLoad ? "required"
: "optional";
@@ -141,6 +142,7 @@ PlayerUtils.registerPrefixedEMEEventListeners = function(player) {
// The prefixed API is all synchronous, so wrap the calls in a promise.
return new Promise(function(resolve, reject) {
PlayerUtils.registerDefaultEventListeners(player);
+ player.video.receivedKeyMessage = false;
resolve(player);
});
};