From 6ab475b0f433e4dee97b64917c769d6e6ca5db6d Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Mon, 10 Dec 2018 19:22:28 -0500 Subject: [PATCH] Make SSL tests work in servodriver. --- etc/ci/buildbot_steps.yml | 4 ++-- tests/wpt/metadata/MANIFEST.json | 2 +- .../tools/wptrunner/wptrunner/browsers/servodriver.py | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/etc/ci/buildbot_steps.yml b/etc/ci/buildbot_steps.yml index f2a8c5db887..ef7db03bcc5 100644 --- a/etc/ci/buildbot_steps.yml +++ b/etc/ci/buildbot_steps.yml @@ -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: diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 54d82a98ee7..52191180bea 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -671067,7 +671067,7 @@ "support" ], "tools/wptrunner/wptrunner/browsers/servodriver.py": [ - "1632f8f539ced2807ea7fa89258f6db9ef4eb47c", + "44efb8950b68a593417e49be668148b5daa452f6", "support" ], "tools/wptrunner/wptrunner/browsers/webkit.py": [ diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py index a6e614cdb60..44efb8950b6 100644 --- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py +++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py @@ -89,6 +89,7 @@ class ServoWebDriverBrowser(Browser): 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 @@ class ServoWebDriverBrowser(Browser): 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]