Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-12 08:55:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update to latest wptrunner (036c9931).

Browse source
This commit is contained in:
James Graham 2015-04-21 18:24:41 +01:00
parent 88d9c1b257
commit f837e575fe
33 changed files with 709 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/wpt/harness/wptrunner/testloader.py
View file

@ -190,8 +190,6 @@ class EqualTimeChunker(TestChunker):
class TestFilter(object):
def __init__(self, test_manifests, include=None, exclude=None, manifest_path=None):
test_manifests = test_manifests
if manifest_path is not None and include is None:
self.manifest = manifestinclude.get_manifest(manifest_path)
else:
@ -355,7 +353,7 @@ class TestLoader(object):
for test_path, test_type, test in self.iter_tests():
enabled = not test.disabled()
if not self.include_https and test.protocol == "https":
if not self.include_https and test.environment["protocol"] == "https":
enabled = False
key = "enabled" if enabled else "disabled"
tests[key][test_type].append(test)