Backed out changeset 98267962a9a7 (bug 1291320)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 29 Mar 2017 00:31:00 +0200
changeset 350176 517ccea63fe0283ac9ffa3976da60e088c4dd853
parent 350175 7697c16a882838db729af63efdd8790a976f2342
child 350177 7c1fe74aad56bc08877eefe8daddaae75f9734c8
push id39700
push userarchaeopteryx@coole-files.de
push dateTue, 28 Mar 2017 22:32:01 +0000
treeherderautoland@7c1fe74aad56 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1291320
milestone55.0a1
backs out98267962a9a72ff01943ed819d474d053c18c36d
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 98267962a9a7 (bug 1291320)
testing/marionette/harness/marionette_harness/runner/httpd.py
--- a/testing/marionette/harness/marionette_harness/runner/httpd.py
+++ b/testing/marionette/harness/marionette_harness/runner/httpd.py
@@ -27,29 +27,20 @@ default_ssl_key = os.path.join(root, "ce
 
 @handlers.handler
 def upload_handler(request, response):
     return 200, [], [request.headers.get("Content-Type")] or []
 
 
 @handlers.handler
 def slow_loading_document(request, response):
-    # Allow the test specify the delay for delivering the content
-    params = dict(urlparse.parse_qsl(request.url_parts.query))
-    delay = int(params.get('delay', 5))
-    time.sleep(delay)
-
-    # Do not allow the page to be cached to circumvent the bfcache of the browser
-    response.headers.set("Cache-Control", "no-cache, no-store")
-    response.content = """<!doctype html>
-<meta charset="UTF-8">
-<title>Slow page loading</title>
-
-<p>Delay: <span id="delay">{}</span></p>
-""".format(delay)
+    time.sleep(5)
+    return """<!doctype html>
+<title>ok</title>
+<p>ok"""
 
 
 class NotAliveError(Exception):
     """Occurs when attempting to run a function that requires the HTTPD
     to have been started, and it has not.
 
     """
     pass