Bug 1321517 - Improve error when unable to find SSL key or cert. r=ato draft
authorVenkatesh Pitta <venkateshpitta@gmail.com>
Tue, 27 Mar 2018 04:52:34 +1100
changeset 776663 fae065d4d6a4ea3535518c5eeafc0dd381802ac3
parent 776583 4a3275936ddf871103b53e00608e2b8d5aee7e69
child 776664 1fd493e00e5d7b90c175ec4bbd92e3fca4dedfba
push id104941
push userbmo:ato@sny.no
push dateTue, 03 Apr 2018 15:05:46 +0000
reviewersato
bugs1321517
milestone61.0a1
Bug 1321517 - Improve error when unable to find SSL key or cert. r=ato
testing/web-platform/tests/tools/wptserve/wptserve/server.py
--- a/testing/web-platform/tests/tools/wptserve/wptserve/server.py
+++ b/testing/web-platform/tests/tools/wptserve/wptserve/server.py
@@ -394,19 +394,20 @@ class WebTestHttpd(object):
 
         self.use_ssl = use_ssl
         self.logger = get_logger()
 
         if server_cls is None:
             server_cls = WebTestServer
 
         if use_ssl:
-            if key_file is not None:
-                assert os.path.exists(key_file)
-            assert certificate is not None and os.path.exists(certificate)
+            if not os.path.exists(key_file):
+                raise ValueError("SSL certificate not found: {}".format(key_file))
+            if not os.path.exists(certificate):
+                raise ValueError("SSL key not found: {}".format(certificate))
 
         try:
             self.httpd = server_cls((host, port),
                                     handler_cls,
                                     self.router,
                                     self.rewriter,
                                     config=config,
                                     bind_hostname=bind_hostname,