Index: LayoutTests/http/tests/serviceworker/fetch-canvas-tainting.html |
diff --git a/LayoutTests/http/tests/serviceworker/fetch-canvas-tainting.html b/LayoutTests/http/tests/serviceworker/fetch-canvas-tainting.html |
index ab1cbdc618510a2edb99f712e34b57a9ec1c24d5..b0ea0cb0e312a8300cf59e435c3dcb865b42a974 100644 |
--- a/LayoutTests/http/tests/serviceworker/fetch-canvas-tainting.html |
+++ b/LayoutTests/http/tests/serviceworker/fetch-canvas-tainting.html |
@@ -3,12 +3,21 @@ |
<script src="../resources/testharness.js"></script> |
<script src="../resources/testharnessreport.js"></script> |
<script src="resources/test-helpers.js?pipe=sub"></script> |
+<body> |
<script> |
async_test(function(t) { |
+ var login1 = |
+ test_login(t, 'http://127.0.0.1:8000', 'username1', 'password1'); |
+ var login2 = |
+ test_login(t, 'http://localhost:8000', 'username2', 'password2'); |
var SCOPE = 'resources/fetch-canvas-tainting-iframe.html'; |
var SCRIPT = 'resources/fetch-rewrite-worker.js'; |
var host_info = get_host_info(); |
- service_worker_unregister_and_register(t, SCRIPT, SCOPE) |
+ |
+ Promise.all([login1, login2]) |
+ .then(function() { |
+ return service_worker_unregister_and_register(t, SCRIPT, SCOPE); |
+ }) |
.then(function(registration) { |
return wait_for_update(t, registration); |
}) |
@@ -21,6 +30,7 @@ async_test(function(t) { |
var channel = new MessageChannel(); |
channel.port1.onmessage = t.step_func(function(e) { |
assert_equals(e.data.results, 'finish'); |
+ unload_iframe(frame); |
service_worker_unregister_and_done(t, SCOPE); |
}); |
frame.contentWindow.postMessage({}, |
@@ -31,3 +41,4 @@ async_test(function(t) { |
.catch(unreached_rejection(t)); |
}, 'Verify canvas tainting of fetched image in a Service Worker'); |
</script> |
+</body> |