Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-02 22:37:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1639004 - Make mach wpt-metadata-summary run in Python 3, r=karlcow

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D92915
This commit is contained in:
James Graham 2020-10-26 13:12:15 +00:00
parent 10c81eb07b
commit adcdde0bf9
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mach
View File

@ -35,7 +35,6 @@ py2commands="
wpt
wpt-manifest-update
wpt-metadata-merge
wpt-metadata-summary
wpt-serve
wpt-test-paths
wpt-unittest

14
testing/web-platform/metasummary.py
View File

@ -3,7 +3,7 @@ import json
import logging
import os
import re
import urlparse
from urllib import parse as urlparse
from collections import defaultdict
import manifestupdate
@ -133,7 +133,7 @@ def get_manifest(metadata_root, test_path, url_base):
"""
manifest_path = expected.expected_path(metadata_root, test_path)
try:
with open(manifest_path) as f:
with open(manifest_path, "rb") as f:
return compile(f,
data_cls_getter=data_cls_getter,
test_path=test_path,
@ -151,7 +151,7 @@ def get_dir_manifest(path):
values should be computed.
"""
try:
with open(path) as f:
with open(path, "rb") as f:
return compile(f, data_cls_getter=lambda x, y: DirectoryManifest)
except IOError:
return None
@ -216,7 +216,7 @@ def get_dir_paths(test_root, test_path):
def iter_tests(manifests):
for manifest in manifests.iterkeys():
for manifest in manifests.keys():
for test_type, test_path, tests in manifest:
url_base = manifests[manifest]["url_base"]
metadata_base = manifests[manifest]["metadata_path"]
@ -326,10 +326,10 @@ def update_wpt_meta(logger, meta_root, data):
raise ValueError("%s is not a directory" % (meta_root,))
with WptMetaCollection(meta_root) as wpt_meta:
for dir_path, dir_data in sorted(data.iteritems()):
for test, test_data in dir_data.get("_tests", {}).iteritems():
for dir_path, dir_data in sorted(data.items()):
for test, test_data in dir_data.get("_tests", {}).items():
add_test_data(logger, wpt_meta, dir_path, test, None, test_data)
for subtest, subtest_data in test_data.get("_subtests", {}).iteritems():
for subtest, subtest_data in test_data.get("_subtests", {}).items():
add_test_data(logger, wpt_meta, dir_path, test, subtest, subtest_data)