Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make desktop webdriver WPT harness work #22411

Merged
merged 5 commits into from Dec 11, 2018
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Prev

Make SSL tests work in servodriver.

  • Loading branch information
jdm committed Dec 11, 2018
commit 6ab475b0f433e4dee97b64917c769d6e6ca5db6d
@@ -14,7 +14,7 @@ mac-rel-wpt1:
- ./mach test-wpt --release --processes 4 --total-chunks 6 --this-chunk 1 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
- ./mach filter-intermittents wpt-errorsummary.log --log-intermittents intermittents.log --log-filteredsummary filtered-wpt-errorsummary.log --tracker-api default --reporter-api default
- ./mach test-wpt --release --binary-arg=--multiprocess --processes 8 --log-raw test-wpt-mp.log --log-errorsummary wpt-mp-errorsummary.log eventsource
- ./mach test-wpt --release --product=servodriver --headless tests/wpt/mozilla/tests/mozilla/DOMParser.html tests/wpt/mozilla/tests/css/per_glyph_font_fallback_a.html tests/wpt/mozilla/tests/css/img_simple.html
- ./mach test-wpt --release --product=servodriver --headless tests/wpt/mozilla/tests/mozilla/DOMParser.html tests/wpt/mozilla/tests/css/per_glyph_font_fallback_a.html tests/wpt/mozilla/tests/css/img_simple.html tests/wpt/mozilla/tests/mozilla/secure.https.html
- bash ./etc/ci/lockfile_changed.sh

mac-rel-wpt2:
@@ -142,7 +142,7 @@ linux-rel-wpt:
- ./mach test-wpt --release --processes 24 --total-chunks 2 --this-chunk 1 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
- ./mach filter-intermittents wpt-errorsummary.log --log-intermittents intermittents.log --log-filteredsummary filtered-wpt-errorsummary.log --tracker-api default --reporter-api default
- ./mach test-wpt --release --binary-arg=--multiprocess --processes 24 --log-raw test-wpt-mp.log --log-errorsummary wpt-mp-errorsummary.log eventsource
- ./mach test-wpt --release --product=servodriver --headless tests/wpt/mozilla/tests/mozilla/DOMParser.html tests/wpt/mozilla/tests/css/per_glyph_font_fallback_a.html tests/wpt/mozilla/tests/css/img_simple.html
- ./mach test-wpt --release --product=servodriver --headless tests/wpt/mozilla/tests/mozilla/DOMParser.html tests/wpt/mozilla/tests/css/per_glyph_font_fallback_a.html tests/wpt/mozilla/tests/css/img_simple.html tests/wpt/mozilla/tests/mozilla/secure.https.html
- ./etc/ci/clean_build_artifacts.sh

linux-rel-css:
"support"
],
"tools/wptrunner/wptrunner/browsers/servodriver.py": [
"1632f8f539ced2807ea7fa89258f6db9ef4eb47c",
"44efb8950b68a593417e49be668148b5daa452f6",
"support"
],
"tools/wptrunner/wptrunner/browsers/webkit.py": [
@@ -89,6 +89,7 @@ def __init__(self, logger, binary, debug_info=None, webdriver_host="127.0.0.1",
self.command = None
self.user_stylesheets = user_stylesheets if user_stylesheets else []
self.headless = headless if headless else False
self.ca_certificate_path = server_config.ssl_config["ca_cert_path"]

def start(self, **kwargs):
self.webdriver_port = get_free_port(4444, exclude=self.used_ports)
@@ -117,6 +118,9 @@ def start(self, **kwargs):
if self.headless:
command += ["--headless"]

if self.ca_certificate_path:
command += ["--certificate-path", self.ca_certificate_path]

for stylesheet in self.user_stylesheets:
command += ["--user-stylesheet", stylesheet]

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.