Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 00:35:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1626000 [wpt PR 22538] - Make stability.py work with py3, a=testonly

Browse Source 
Automatic update from web-platform-tests
Make stability.py work with py3 (#22538)

Running wpt run --verify was failing in py3 for 2 reasons:

* Importing modules from the same dir was not working
* iteritems() is not defined for collections
--

wpt-commits: 3637298f9c5198cdf6a91f0a4920f6c1836eb614
wpt-pr: 22538
This commit is contained in:
Sergio 2020-03-31 12:25:24 +00:00 committed by moz-wptsync-bot
parent ed871c04a3
commit 2699b2d25d
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
testing/web-platform/tests/tools/wptrunner/wptrunner/stability.py
View File

@ -5,6 +5,7 @@ import io
import os
from collections import OrderedDict, defaultdict
from datetime import datetime
from six import iteritems
from mozlog import reader
from mozlog.formatters import JSONFormatter
@ -140,10 +141,10 @@ def process_results(log, iterations):
handler = LogHandler()
reader.handle_log(reader.read(log), handler)
results = handler.results
for test_name, test in results.iteritems():
for test_name, test in iteritems(results):
if is_inconsistent(test["status"], iterations):
inconsistent.append((test_name, None, test["status"], []))
for subtest_name, subtest in test["subtests"].iteritems():
for subtest_name, subtest in iteritems(test["subtests"]):
if is_inconsistent(subtest["status"], iterations):
inconsistent.append((test_name, subtest_name, subtest["status"], subtest["messages"]))
@ -208,7 +209,7 @@ def write_results(log, results, iterations, pr_number=None, use_details=False):
"tests" if len(results) > 1
else "test"))
for test_name, test in results.iteritems():
for test_name, test in iteritems(results):
baseurl = "http://w3c-test.org/submissions"
if "https" in os.path.splitext(test_name)[0].split(".")[1:]:
baseurl = "https://w3c-test.org/submissions"
@ -236,7 +237,7 @@ def write_results(log, results, iterations, pr_number=None, use_details=False):
def run_step(logger, iterations, restart_after_iteration, kwargs_extras, **kwargs):
import wptrunner
from . import wptrunner
kwargs = copy.deepcopy(kwargs)
if restart_after_iteration:
@ -278,7 +279,7 @@ def get_steps(logger, repeat_loop, repeat_restart, kwargs_extras):
for kwargs_extra in kwargs_extras:
if kwargs_extra:
flags_string = " with flags %s" % " ".join(
"%s=%s" % item for item in kwargs_extra.iteritems())
"%s=%s" % item for item in iteritems(kwargs_extra))
else:
flags_string = ""

2
testing/web-platform/tests/tools/wptrunner/wptrunner/wptrunner.py
View File

@ -339,7 +339,7 @@ def run_tests(config, test_paths, product, **kwargs):
def check_stability(**kwargs):
import stability
from . import stability
if kwargs["stability"]:
logger.warning("--stability is deprecated; please use --verify instead!")
kwargs['verify_max_time'] = None