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

Make SSL tests work in servodriver.

Browse source
This commit is contained in:
Josh Matthews 2018-12-10 19:22:28 -05:00
parent 08b76ee73f
commit 6ab475b0f4
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
etc/ci/buildbot_steps.yml
View file

@ -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 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 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 --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 - bash ./etc/ci/lockfile_changed.sh
mac-rel-wpt2: 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 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 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 --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 - ./etc/ci/clean_build_artifacts.sh
linux-rel-css: linux-rel-css:

2
tests/wpt/metadata/MANIFEST.json
View file

@ -671067,7 +671067,7 @@
"support" "support"
], ],
"tools/wptrunner/wptrunner/browsers/servodriver.py": [ "tools/wptrunner/wptrunner/browsers/servodriver.py": [
"1632f8f539ced2807ea7fa89258f6db9ef4eb47c", "44efb8950b68a593417e49be668148b5daa452f6",
"support" "support"
], ],
"tools/wptrunner/wptrunner/browsers/webkit.py": [ "tools/wptrunner/wptrunner/browsers/webkit.py": [

4
tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py
View file

@ -89,6 +89,7 @@ class ServoWebDriverBrowser(Browser):
self.command = None self.command = None
self.user_stylesheets = user_stylesheets if user_stylesheets else [] self.user_stylesheets = user_stylesheets if user_stylesheets else []
self.headless = headless if headless else False self.headless = headless if headless else False
self.ca_certificate_path = server_config.ssl_config["ca_cert_path"]
def start(self, **kwargs): def start(self, **kwargs):
self.webdriver_port = get_free_port(4444, exclude=self.used_ports) self.webdriver_port = get_free_port(4444, exclude=self.used_ports)
@ -117,6 +118,9 @@ class ServoWebDriverBrowser(Browser):
if self.headless: if self.headless:
command += ["--headless"] command += ["--headless"]
if self.ca_certificate_path:
command += ["--certificate-path", self.ca_certificate_path]
for stylesheet in self.user_stylesheets: for stylesheet in self.user_stylesheets:
command += ["--user-stylesheet", stylesheet] command += ["--user-stylesheet", stylesheet]