From 2fd692d1a373d7a335d8c4a8250afe83345c4712 Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Wed, 29 Mar 2017 00:31:00 +0200 Subject: [PATCH] Backed out changeset 98267962a9a7 (bug 1291320) --- .../harness/marionette_harness/runner/httpd.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/testing/marionette/harness/marionette_harness/runner/httpd.py b/testing/marionette/harness/marionette_harness/runner/httpd.py index bf28b4a65f9b..dca7ffc0a281 100755 --- a/testing/marionette/harness/marionette_harness/runner/httpd.py +++ b/testing/marionette/harness/marionette_harness/runner/httpd.py @@ -32,19 +32,10 @@ def upload_handler(request, response): @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 = """ - -Slow page loading - -

Delay: {}

-""".format(delay) + time.sleep(5) + return """ +ok +

ok""" class NotAliveError(Exception):