fixup! fixup! fixup! Initial support for running tests with ssl enabl…

…ed in Firefox.

wptrunner/browsers/firefox.py

@@ -52,11 +52,12 @@ def executor_kwargs(http_server_url, **kwargs):
 
 
 def env_options():
-    return {"host": "localhost",
+    return {"host": "127.0.0.1",
             "external_host": "web-platform.test",
-            "bind_hostname": "true",
+            "bind_hostname": "false",
             "required_files": required_files,
-            "certificate_domain": "web-platform.test"}
+            "certificate_domain": "web-platform.test",
+            "encrypt_after_connect": True}
 
 
 class FirefoxBrowser(Browser):

wptrunner/browsers/server-locations.txt

@@ -21,6 +21,13 @@ http://www2.web-platform.test:8001
 http://xn--n8j6ds53lwwkrqhv28a.web-platform.test:8001
 http://xn--lve-6lad.web-platform.test:8001
 
+https://web-platform.test:8443
+https://www.web-platform.test:8443
+https://www1.web-platform.test:8443
+https://www2.web-platform.test:8443
+https://xn--n8j6ds53lwwkrqhv28a.web-platform.test:8443
+https://xn--lve-6lad.web-platform.test:8443
+
 # These are actually ws servers, but until mozprofile is
 # fixed we have to pretend that they are http servers
 http://web-platform.test:8888

wptrunner/config.json

@@ -3,4 +3,5 @@
           "https":[8443],
           "ws":[8888]},
  "check_subdomains":false,
- "bind_hostname":%(bind_hostname)s}
+ "bind_hostname":%(bind_hostname)s,
+ "ssl":{}}

wptrunner/wptrunner.py

@@ -44,7 +44,6 @@
 The upstream repository has the facility for creating a test manifest in JSON
 format. This manifest is used directly to determine which tests exist. Local
 metadata files are used to store the expected test results.
-
 """
 
 logger = None
@@ -75,8 +74,6 @@ def do_delayed_imports(serve_root):
     sys.path.insert(0, str(os.path.join(serve_root, "tools", "scripts")))
     failed = []
 
-    print sys.path
-
     try:
         import serve
     except ImportError:
@@ -172,6 +169,7 @@ def load_config(self):
         #TODO: allow non-default configuration for ssl
 
         local_config["external_host"] = self.options.get("external_host", None)
+        local_config["ssl"]["encrypt_after_connect"] = self.options.get("encrypt_after_connect", False)
 
         config = serve.merge_json(default_config, local_config)
         config["doc_root"] = self.serve_path