servo · bors-servo · Sep 17, 2015 · Sep 17, 2015 · Sep 17, 2015
diff --git a/tests/wpt/metadata/2dcontext/transformations/canvas_transformations_reset_001.html.ini b/tests/wpt/metadata/2dcontext/transformations/canvas_transformations_reset_001.html.ini
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
diff --git a/tests/wpt/metadata/XMLHttpRequest/status-basic.htm.ini b/tests/wpt/metadata/XMLHttpRequest/status-basic.htm.ini
@@ -1,8 +1,8 @@
 [status-basic.htm]
   type: testharness
-
   [XMLHttpRequest: status/statusText - various responses 7 (GET 402)]
     expected: FAIL
 
   [XMLHttpRequest: status/statusText - various responses 9 (CHICKEN 402)]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/encoding/big5-encoder.html.ini b/tests/wpt/metadata/encoding/big5-encoder.html.ini
@@ -0,0 +1,41 @@
+[big5-encoder.html]
+  type: testharness
+  [big5 encoder: very basic]
+    expected: FAIL
+
+  [big5 encoder: Highest-pointer BMP character excluded from encoder]
+    expected: FAIL
+
+  [big5 encoder: Highest-pointer character excluded from encoder]
+    expected: FAIL
+
+  [big5 encoder: Lowest-pointer character included in encoder]
+    expected: FAIL
+
+  [big5 encoder: Euro; the highest-pointer character before a range of 30 unmapped pointers]
+    expected: FAIL
+
+  [big5 encoder: The lowest-pointer character after the range of 30 unmapped pointers]
+    expected: FAIL
+
+  [big5 encoder: The highest-pointer character before a range of 41 unmapped pointers]
+    expected: FAIL
+
+  [big5 encoder: The lowest-pointer character after the range of 41 unmapped pointers]
+    expected: FAIL
+
+  [big5 encoder: The last character in the index]
+    expected: FAIL
+
+  [big5 encoder: The canonical BMP test character that is not in the index]
+    expected: FAIL
+
+  [big5 encoder: The canonical astral test character that is not in the index]
+    expected: FAIL
+
+  [big5 encoder: A Plane 2 character whose low 16 bits match a BMP character that has a lower pointer]
+    expected: FAIL
+
+  [big5 encoder: A duplicate-mapped code point that prefers the highest pointer in the encoder]
+    expected: FAIL
+
diff --git a/...requirements-for-implementations/other-elements-attributes-and-apis/document-all.html.ini b/...requirements-for-implementations/other-elements-attributes-and-apis/document-all.html.ini
@@ -0,0 +1,8 @@
+[document-all.html]
+  type: testharness
+  ['unusual behaviors' of document.all]
+    expected: FAIL
+
+  ['unusual behaviors' of document.all with assignment]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/the-input-element/input-textselection-01.html.ini b/tests/wpt/metadata/html/semantics/forms/the-input-element/input-textselection-01.html.ini
@@ -66,3 +66,6 @@
   [Selection attributes should not apply to type reset]
     expected: FAIL
 
+  [Selection attributes should not apply to type email]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/scripting/event-loops/task_microtask_ordering.html.ini b/tests/wpt/metadata/html/webappapis/scripting/event-loops/task_microtask_ordering.html.ini
@@ -0,0 +1,8 @@
+[task_microtask_ordering.html]
+  type: testharness
+  [Basic task and microtask ordering]
+    expected: FAIL
+
+  [Level 1 bossfight (synthetic click)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/mozilla-sync b/tests/wpt/metadata/mozilla-sync
@@ -1 +1 @@
-dbf549ea32d23cf96b7f49e3333c068aaf050bc3
+9e914ca0db2820b365c06deedb8b5325c63c007b
diff --git a/tests/wpt/update/upstream.py b/tests/wpt/update/upstream.py
@@ -92,11 +92,11 @@ class CheckoutBranch(Step):
     def create(self, state):
         self.logger.info("Updating sync tree from %s" % state.sync["remote_url"])
         state.branch = state.sync_tree.unique_branch_name(
-            "outbound_update_%s" % state.test_manifest.rev)
+            "outbound_update_%s" % state.old_manifest.rev)
         state.sync_tree.update(state.sync["remote_url"],
                                state.sync["branch"],
                                state.branch)
-        state.sync_tree.checkout(state.test_manifest.rev, state.branch, force=True)
+        state.sync_tree.checkout(state.old_manifest.rev, state.branch, force=True)
 
 
 class GetLastSyncCommit(Step):

diff --git a/tests/wpt/web-platform-tests/2dcontext/transformations/canvas_transformations_reset_001.html b/tests/wpt/web-platform-tests/2dcontext/transformations/canvas_transformations_reset_001.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<link rel="match" href="canvas_transformations_reset_001-ref.htm">
+<link rel="match" href="canvas_transformations_reset_001-ref.html">
 <style>
   html, body {
     margin: 0;

diff --git a/tests/wpt/web-platform-tests/DOMEvents/tests/approved/stopPropagation.dispatchEvent.html b/tests/wpt/web-platform-tests/DOMEvents/tests/approved/stopPropagation.dispatchEvent.html
diff --git a/...-tests/DOMEvents/tests/submissions/Microsoft/converted/stopPropagation.dispatchEvent.html b/...-tests/DOMEvents/tests/submissions/Microsoft/converted/stopPropagation.dispatchEvent.html
diff --git a/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/base-uri-allow.sub.html b/tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/base-uri-allow.sub.html
@@ -14,7 +14,13 @@
     <base href="http://www1.{{host}}:{{ports[http][0]}}/">
     <script>
         test(function() {
-            assert_equals(document.baseURI, 'http://www1.{{host}}:{{ports[http][0]}}/');
+            if ('{{ports[http][0]}}' == '80' ||
+               '{{ports[http][0]}}' == '443') {
+                assert_equals(document.baseURI, 'http://www1.{{host}}/');
+            } else {
+                assert_equals(document.baseURI, 'http://www1.{{host}}' + ':{{ports[http][0]}}/');
+            }
+
             log("TEST COMPLETE")
         });
 

diff --git a/...b-platform-tests/content-security-policy/blink-contrib-2/form-action-src-allowed.sub.html b/...b-platform-tests/content-security-policy/blink-contrib-2/form-action-src-allowed.sub.html
@@ -6,12 +6,15 @@
     <title>form-action-src-allowed</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["TEST COMPLETE"]'></script>
+    <script src='../support/logTest.sub.js?logs=["PASS","TEST COMPLETE"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
     <!-- enforcing policy:
 form-action 'self'; script-src 'self' 'unsafe-inline'; connect-src 'self';
 -->
     <script>
+        window.addEventListener("message", function(event) {
+            log(event.data);
+        }, false);
         window.addEventListener('load', function() {
             setTimeout(function() {
                 document.getElementById('submit').click();
@@ -23,13 +26,15 @@
 </head>
 
 <body>
-    <form action="../support/pass.png" id="theform" method="post" target="_blank">
+    <iframe name="test_target" id="test_iframe"></iframe>
+
+    <form action="/common/redirect.py?location=/content-security-policy/blink-contrib/resources/postmessage-pass.html" id="theform" method="post" target="test_target">
         <input type="text" name="fieldname" value="fieldvalue">
         <input type="submit" id="submit" value="submit">
     </form>
     <p>Tests that allowed form actions work correctly. If this test passes, you will see a page indicating a form was POSTed.</p>
     <div id="log"></div>
     <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
-</body>
+    </body>
 
 </html>
diff --git a/...b-platform-tests/content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html b/...b-platform-tests/content-security-policy/blink-contrib-2/form-action-src-blocked.sub.html
@@ -12,25 +12,29 @@
 form-action 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self';
 -->
     <script>
+        window.addEventListener("message", function(event) {
+            alert_assert(event.data);
+        }, false);
         window.addEventListener('load', function() {
             setTimeout(function() {
                 document.getElementById('submit').click();
-                log("TEST COMPLETE");
             }, 0);
         });
-        setTimeout(function() {}, 1000);
+        setTimeout(function() {log("TEST COMPLETE");}, 1);
 
     </script>
 </head>
 
 <body>
-    <form action="../content-security-policy/support/fail.png" id="theform" method="post">
+    <iframe name="test_target" id="test_iframe"></iframe>
+    <form action="/common/redirect.py?location=/content-security-policy/blink-contrib/resources/postmessage-fail.html" id="theform" method="post" target="test_target">
         <input type="text" name="fieldname" value="fieldvalue">
         <input type="submit" id="submit" value="submit">
     </form>
     <p>Tests that blocking form actions works correctly. If this test passes, a CSP violation will be generated, and will not see a page indicating a form was POSTed.</p>
     <div id="log"></div>
     <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=form-action%20&apos;none&apos;"></script>
-</body>
+
+    </body>
 
 </html>
diff --git a/...rm-tests/content-security-policy/blink-contrib-2/form-action-src-default-ignored.sub.html b/...rm-tests/content-security-policy/blink-contrib-2/form-action-src-default-ignored.sub.html
@@ -6,12 +6,15 @@
     <title>form-action-src-default-ignored</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src='../support/logTest.sub.js?logs=["TEST COMPLETE"]'></script>
+    <script src='../support/logTest.sub.js?logs=["PASS","TEST COMPLETE"]'></script>
     <script src="../support/alertAssert.sub.js?alerts=[]"></script>
     <!-- enforcing policy:
-default-src 'none'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self';
+default-src 'none'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self'; frame-src 'self';
 -->
     <script>
+        window.addEventListener("message", function(event) {
+            log(event.data);
+        }, false);
         window.addEventListener('load', function() {
             setTimeout(function() {
                 document.getElementById('submit').click();
@@ -23,11 +26,13 @@
 </head>
 
 <body>
-    <form action="../support/pass.png" id="theform" method="post" target="_blank">
+    <iframe name="test_target" id="test_iframe"></iframe>
+
+    <form action="/common/redirect.py?location=/content-security-policy/blink-contrib/resources/postmessage-pass.html" id="theform" method="post" target="test_target">
         <input type="text" name="fieldname" value="fieldvalue">
         <input type="submit" id="submit" value="submit">
     </form>
-    <p>Tests that default-src does. If this test passes, you will see a page indicating a form was POSTed or a blocked pop-up warning.</p>
+    <p>Tests that default-src does not cascade to form-action.</p>
     <div id="log"></div>
     <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
 </body>

diff --git a/...tent-security-policy/blink-contrib-2/form-action-src-default-ignored.sub.html.sub.headers b/...tent-security-policy/blink-contrib-2/form-action-src-default-ignored.sub.html.sub.headers
@@ -3,4 +3,4 @@ Cache-Control: no-store, no-cache, must-revalidate
 Cache-Control: post-check=0, pre-check=0, false
 Pragma: no-cache
 Set-Cookie: form-action-src-default-ignored={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: default-src 'none'; script-src 'self' 'unsafe-inline' 'unsafe-inline'; connect-src 'self'; style-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
+Content-Security-Policy: default-src 'none'; script-src 'self' 'unsafe-inline'; connect-src 'self'; style-src 'self'; frame-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}