Import wpt@424249088dd679888e07bd315dd8ebc98ccf323a

Using wpt-import in Chromium d8af36a. With Chromium commits locally applied on WPT: 1d5b803 "Add WebVTT support for inline styling - Web Platform Tests" 9be931c "[WPT/common/security-features] Refactor navigable tests" Note to sheriffs: This CL imports external tests and adds expectations for those tests; if this CL is large and causes a few new failures, please fix the failures by adding new lines to TestExpectations rather than reverting. See: https://chromium.googlesource.com/chromium/src/+/master/docs/testing/web_platform_tests.md Directory owners for changes in this CL: foolip@chromium.org, lpz@chromium.org, robertma@chromium.org: external/wpt/tools NOAUTOREVERT=true TBR=robertma No-Export: true Change-Id: I70ae0c97bae7060d2ca4961634db6fffd7096b74 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1895403 Reviewed-by: WPT Autoroller <wpt-autoroller@chops-service-accounts.iam.gserviceaccount.com> Commit-Queue: WPT Autoroller <wpt-autoroller@chops-service-accounts.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#712015}
chromium · Nov 3, 2019 · f500218 · f500218
1 parent 3832e0a
commit f500218
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 17 deletions.
diff --git a/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_6.json b/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_6.json
@@ -249744,6 +249744,12 @@
      {}
     ]
    ],
+   "html/semantics/forms/the-button-element/button-submit-children.html": [
+    [
+     "html/semantics/forms/the-button-element/button-submit-children.html",
+     {}
+    ]
+   ],
    "html/semantics/forms/the-button-element/button-type.html": [
     [
      "html/semantics/forms/the-button-element/button-type.html",
@@ -457273,6 +457279,10 @@
    "1747bd727aa2fb4deb8f2a81601523776a51a355",
    "testharness"
   ],
+  "html/semantics/forms/the-button-element/button-submit-children.html": [
+   "06218f4fc9e99efe2d87a9eb85582d3dc84434a1",
+   "testharness"
+  ],
   "html/semantics/forms/the-button-element/button-type.html": [
    "6cfd6687c707479600534de03156afa698daa314",
    "testharness"
@@ -494286,7 +494296,7 @@
    "support"
   ],
   "resources/chromium/nfc-mock.js": [
-   "811c0aeafceed8e16148ae4c678b55733fc6c8b8",
+   "aff72bbad028ecd6b8c6a8023841e08f072adfac",
    "support"
   ],
   "resources/chromium/sensor.mojom.js": [
@@ -503550,15 +503560,15 @@
    "support"
   ],
   "tools/ci/run_tc.py": [
-   "fd129ef51a3cb322ae1a1b84b836c05d22e765fb",
+   "be7dbe082a1709493b62316d15668ea10ae93607",
    "support"
   ],
   "tools/ci/taskcluster-run.py": [
    "8a60012d09b4d5be9845cf4ab74e5f87bf4b58ce",
    "support"
   ],
   "tools/ci/tcdownload.py": [
-   "6e4d960da900c670701807455bd67b247e37f34b",
+   "256726da7b568f32115dfeaa6bc1407490c0d076",
    "support"
   ],
   "tools/ci/website_build.sh": [
@@ -507842,7 +507852,7 @@
    "support"
   ],
   "tools/wpt/browser.py": [
-   "19ce72d727177e555d801ff2ac628bc943044c13",
+   "fb10d75631305bd66044f033d3ac8f5e8ffb4a0b",
    "support"
   ],
   "tools/wpt/commands.json": [
@@ -513998,7 +514008,7 @@
    "manual"
   ],
   "web-nfc/NDEFReader_options.https.html": [
-   "ab55e2c160bd39710a62238fce795ff63f03c995",
+   "389fff9e041e284358a87e5cc133046d4a579b84",
    "testharness"
   ],
   "web-nfc/NDEFReader_scan.https.html": [
@@ -514014,7 +514024,7 @@
    "testharness"
   ],
   "web-nfc/NDEFRecord_constructor.https.html": [
-   "cea517d37aa17bf94c3d96c9abd19db5f1fa184c",
+   "1206afb4713dc7e4b48dcc837b3dd708382a9ce2",
    "testharness"
   ],
   "web-nfc/NDEFWriter-document-hidden-manual.https-expected.txt": [
@@ -514026,11 +514036,11 @@
    "manual"
   ],
   "web-nfc/NDEFWriter_push.https-expected.txt": [
-   "7686d146c267d43e467264de7bdb01118c33919a",
+   "59f71af0b68166c78f2b6c417d49e5d0c85eb980",
    "support"
   ],
   "web-nfc/NDEFWriter_push.https.html": [
-   "fbebac946dfbf77a49c11c0472da900ca26759be",
+   "2be655fbbf93cfb0c0c8813f86dc3e98450af720",
    "testharness"
   ],
   "web-nfc/OWNERS": [
@@ -514054,7 +514064,7 @@
    "testharness"
   ],
   "web-nfc/resources/nfc-helpers.js": [
-   "80f0882f9f8deff30b0c8c60ecb1bfc7c6df168c",
+   "cf9b510f30424e79412cc35098f63f5afd05707b",
    "support"
   ],
   "web-nfc/resources/support-iframe.html": [

diff --git a/third_party/blink/web_tests/external/wpt/tools/ci/run_tc.py b/third_party/blink/web_tests/external/wpt/tools/ci/run_tc.py
@@ -51,9 +51,6 @@
     from urllib.request import urlopen
 
 
-QUEUE_BASE = "https://queue.taskcluster.net/v1/task"
-
-
 root = os.path.abspath(
     os.path.join(os.path.dirname(__file__),
                  os.pardir,
@@ -325,7 +322,14 @@ def fetch_event_data():
         # For example under local testing
         return None
 
-    resp = urlopen("%s/%s" % (QUEUE_BASE, task_id))
+    root_url = os.environ['TASKCLUSTER_ROOT_URL']
+    if root_url == 'https://taskcluster.net':
+        queue_base = "https://queue.taskcluster.net/v1/task"
+    else:
+        queue_base = root_url + "/api/queue/v1/task"
+
+
+    resp = urlopen("%s/%s" % (queue_base, task_id))
 
     task_data = json.load(resp)
     event_data = task_data.get("extra", {}).get("github_event")

diff --git a/third_party/blink/web_tests/external/wpt/tools/ci/tcdownload.py b/third_party/blink/web_tests/external/wpt/tools/ci/tcdownload.py
@@ -10,6 +10,10 @@
 logging.basicConfig()
 logger = logging.getLogger("tc-download")
 
+# The root URL of the Taskcluster deployment from which to download wpt reports
+# (after https://bugzilla.mozilla.org/show_bug.cgi?id=1574668 lands, this will
+# be https://community-tc.services.mozilla.com)
+TASKCLUSTER_ROOT_URL = 'https://taskcluster.net'
 
 def get_parser():
     parser = argparse.ArgumentParser()
@@ -74,8 +78,13 @@ def run(*args, **kwargs):
         return 1
 
     for taskgroup in taskgroups:
-        taskgroup_url = "https://queue.taskcluster.net/v1/task-group/%s/list"
-        artifacts_list_url = "https://queue.taskcluster.net/v1/task/%s/artifacts"
+        if TASKCLUSTER_ROOT_URL == 'https://taskcluster.net':
+            # NOTE: this condition can be removed after November 9, 2019
+            taskgroup_url = "https://queue.taskcluster.net/v1/task-group/%s/list"
+            artifacts_list_url = "https://queue.taskcluster.net/v1/task/%s/artifacts"
+        else:
+            taskgroup_url = TASKCLUSTER_ROOT_URL + "/api/queue/v1/task-group/%s/list"
+            artifacts_list_url = TASKCLUSTER_ROOT_URL + "/api/queue/v1/task/%s/artifacts"
         tasks = get_json(taskgroup_url % taskgroup, "tasks")
         for task in tasks:
             task_id = task["status"]["taskId"]

diff --git a/third_party/blink/web_tests/external/wpt/tools/wpt/browser.py b/third_party/blink/web_tests/external/wpt/tools/wpt/browser.py
@@ -17,6 +17,10 @@
 
 uname = platform.uname()
 
+# the rootUrl for the firefox-ci deployment of Taskcluster
+# (after November 9, https://firefox-ci-tc.services.mozilla.com/)
+FIREFOX_CI_ROOT_URL = 'https://taskcluster.net'
+
 
 def _get_fileversion(binary, logger=None):
     command = "(Get-Item '%s').VersionInfo.FileVersion" % binary.replace("'", "''")
@@ -423,8 +427,13 @@ def install(self, dest=None, channel=None):
         if dest is None:
             dest = os.pwd
 
-        TC_QUEUE_BASE = "https://queue.taskcluster.net/v1/"
-        TC_INDEX_BASE = "https://index.taskcluster.net/v1/"
+        if FIREFOX_CI_ROOT_URL == 'https://taskcluster.net':
+            # NOTE: this condition can be removed after November 9, 2019
+            TC_QUEUE_BASE = "https://queue.taskcluster.net/v1/"
+            TC_INDEX_BASE = "https://index.taskcluster.net/v1/"
+        else:
+            TC_QUEUE_BASE = FIREFOX_CI_ROOT_URL + "/api/queue/v1/"
+            TC_INDEX_BASE = FIREFOX_CI_ROOT_URL + "/api/index/v1/"
 
 
         resp = requests.get(TC_INDEX_BASE +