Bug 1512011 - [talos] Replace mozhttpd with wptserve; r=rwood,perftest-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D50943

--HG--
extra : moz-landing-system : lando

testing/talos/requirements.txt

@@ -2,7 +2,6 @@ jsonschema>=2.5.1
 mozlog>=5.0
 mozcrash>=0.15
 mozfile>=1.2
-mozhttpd>=0.7
 mozinfo>=0.8
 mozprocess>=0.22
 mozversion>=1.3
@@ -11,3 +10,4 @@ mozrunner>=7.1.0
 psutil>=3.1.1
 simplejson>=2.1.1
 requests>=2.9.1
+wptserve>=2.0.0

testing/talos/talos/run_tests.py

@@ -13,9 +13,10 @@ import time
 import traceback
 import urllib
 
-import mozhttpd
 import mozinfo
 import mozversion
+from wptserve import server
+from wptserve.handlers import handler
 
 from talos import utils
 from mozlog import get_proxy_logger
@@ -79,11 +80,22 @@ def set_tp_preferences(test, browser_config):
 
 
 def setup_webserver(webserver):
-    """use mozhttpd to setup a webserver"""
+    """Set up a new web server with wptserve."""
     LOG.info("starting webserver on %r" % webserver)
 
+    @handler
+    def tracemonkey_pdf_handler(request, response):
+        """Handler for the talos pdfpaint test."""
+        headers = [("Content-Type", "application/pdf")]
+        with open("%s/tests/pdfpaint/tracemonkey.pdf" % here, "rb") as file:
+            content = file.read()
+        return headers, content
+
     host, port = webserver.split(':')
-    return mozhttpd.MozHttpd(host=host, port=int(port), docroot=here)
+    httpd = server.WebTestHttpd(host=host, port=int(port), doc_root=here)
+    httpd.router.register(
+        "GET", "tests/pdfpaint/tracemonkey.pdf", tracemonkey_pdf_handler)
+    return httpd
 
 
 def run_tests(config, browser_config):

testing/talos/tp5n-pageset.manifest

@@ -1,10 +1,10 @@
 [
-    {
-        "size": 82197883,
-        "visibility": "public",
-        "digest": "f9f68948db06cfc1d427f14db8e60a0c9ab2f41386c92efa408477ea656e76c73b1dd1e7dc558b08e5067f1a2d90efe6f2852518c690384d99fece0e353bf1cb",
-        "algorithm": "sha512",
-        "filename": "tp5n.zip",
-        "unpack": false
-    }
-]
+  {
+    "size": 80669109,
+    "visibility": "public",
+    "digest": "d12b0ec9e80795703066e34aeaa363dc8633fdd8e0e555057fabcf720bc64507113889be49b4acd08910b84e073b18d2ad1f762ba8bfc3af32fd2d6ece957fed",
+    "algorithm": "sha512",
+    "filename": "tp5n.zip",
+    "unpack": false
+  }
+]