Bug 1242108 - Remove unnecessary timeout from flaky sandbox test, r=Ms2ger

This commit is contained in:
James Graham 2016-01-29 11:13:02 +00:00
parent e66c236d5d
commit 82e541dde8
2 changed files with 13 additions and 24 deletions

View File

@ -2,18 +2,16 @@
<html> <html>
<head> <head>
<title>HTML5 video with autoplay attribute.</title> <title>HTML5 video with autoplay attribute.</title>
<script type="text/javascript" src="/common/media.js"></script> <script src="/common/media.js"></script>
</head> </head>
<body> <body>
<script type="text/javascript"> <script>
function do_play(event) {
function do_play(event)
{
parent.window.postMessage("play event fired", "*"); parent.window.postMessage("play event fired", "*");
} }
document.write( document.write(
"<video id='video0' src='" + getVideoURI("/media/green-at-15") + "'" + "<video id='video0' src='" + getVideoURI("/media/green-at-15") + "'" +
" autoplay onplay='do_play(event);'>" " autoplay onplay='do_play(event);'>"
); );
</script> </script>

View File

@ -2,33 +2,24 @@
<html> <html>
<head> <head>
<title>HTML5 Sandbox: Allow autoplay for HTML5 Video inside iframe with sandbox attribute if sandbox='allow-scripts'.</title> <title>HTML5 Sandbox: Allow autoplay for HTML5 Video inside iframe with sandbox attribute if sandbox='allow-scripts'.</title>
<meta name=timeout content=long>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" /> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
<link rel="author" title="Microsoft" href="http://www.microsoft.com/" /> <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
<link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#sandboxed-automatic-features-browsing-context-flag" />
<meta name="assert" content="Allow autoplay for HTML5 Video inside iframe with sandbox attribute if sandbox='allow-scripts'." />
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
</head> </head>
<body> <body>
<script type="text/javascript"> <script>
async_test(function (t) {
var callback = t.step_func_done(function(event) {
var t = async_test("Allow autoplay for HTML5 Video inside iframe with sandbox attribute if sandbox='allow-scripts'."); assert_true('sandbox' in document.createElement('iframe'));
assert_equals(event.data, "play event fired");
function callback(event) });
{
t.step(function(){
assert_true('sandbox' in document.createElement('iframe'));
assert_equals(event.data, "play event fired");
});
t.done();
}
var timer = setTimeout(callback, 8000);
window.addEventListener("message", callback, false); window.addEventListener("message", callback, false);
}, "Allow autoplay for HTML5 Video inside iframe with sandbox attribute if sandbox='allow-scripts'.");
</script> </script>
<iframe src="iframe_sandbox_002.htm" sandbox="allow-scripts" style="display: none"></iframe> <iframe src="iframe_sandbox_002.htm" sandbox="allow-scripts" style="display: none"></iframe>
<div id=log></div> <div id=log></div>
</body> </body>
</html> </html>