mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-13 05:15:45 +00:00
Bug 932179 - Part 3: Fix intermittent timeout in browser_net_security-state.js. r=vporof
This commit is contained in:
parent
fc3d9a92cb
commit
a38978f717
@ -26,6 +26,7 @@ support-files =
|
||||
html_copy-as-curl.html
|
||||
html_curl-utils.html
|
||||
sjs_content-type-test-server.sjs
|
||||
sjs_cors-test-server.sjs
|
||||
sjs_https-redirect-test-server.sjs
|
||||
sjs_simple-test-server.sjs
|
||||
sjs_sorting-test-server.sjs
|
||||
|
@ -14,7 +14,7 @@ add_task(function* () {
|
||||
RequestsMenu.lazyUpdate = false;
|
||||
|
||||
info("Performing a secure request.");
|
||||
debuggee.performRequests(1, "https://example.com");
|
||||
debuggee.performRequests(1, "https://example.com" + CORS_SJS_PATH);
|
||||
|
||||
yield waitForNetworkEvents(monitor, 1);
|
||||
|
||||
|
@ -14,10 +14,10 @@ add_task(function* () {
|
||||
RequestsMenu.lazyUpdate = false;
|
||||
|
||||
info("Requesting a resource over HTTPS.");
|
||||
debuggee.performRequests(1, "https://example.com/request_2");
|
||||
debuggee.performRequests(1, "https://example.com" + CORS_SJS_PATH + "?request_2");
|
||||
yield waitForNetworkEvents(monitor, 1);
|
||||
|
||||
debuggee.performRequests(1, "https://example.com/request_1");
|
||||
debuggee.performRequests(1, "https://example.com" + CORS_SJS_PATH + "?request_1");
|
||||
yield waitForNetworkEvents(monitor, 1);
|
||||
|
||||
is(RequestsMenu.itemCount, 2, "Two events event logged.");
|
||||
|
@ -62,12 +62,12 @@ add_task(function* () {
|
||||
// occasionally hangs waiting for event timings that don't seem to appear...
|
||||
done = waitForNetworkEvents(monitor, 1);
|
||||
info("Requesting a resource over HTTP.");
|
||||
debuggee.performRequests(1, "http://test1.example.com");
|
||||
debuggee.performRequests(1, "http://test1.example.com" + CORS_SJS_PATH);
|
||||
yield done;
|
||||
|
||||
done = waitForNetworkEvents(monitor, 1);
|
||||
info("Requesting a resource over HTTPS.");
|
||||
debuggee.performRequests(1, "https://example.com");
|
||||
debuggee.performRequests(1, "https://example.com" + CORS_SJS_PATH);
|
||||
yield done;
|
||||
|
||||
is(RequestsMenu.itemCount, 3, "Three events logged.");
|
||||
|
@ -15,8 +15,8 @@ add_task(function* () {
|
||||
RequestsMenu.lazyUpdate = false;
|
||||
|
||||
info("Performing requests.");
|
||||
debuggee.performRequests(1, "https://example.com");
|
||||
debuggee.performRequests(1, "http://example.com");
|
||||
debuggee.performRequests(1, "https://example.com" + CORS_SJS_PATH);
|
||||
debuggee.performRequests(1, "http://example.com" + CORS_SJS_PATH);
|
||||
yield waitForNetworkEvents(monitor, 2);
|
||||
|
||||
info("Selecting secure request.");
|
||||
|
@ -11,13 +11,13 @@ add_task(function* () {
|
||||
const TEST_DATA = [
|
||||
{
|
||||
desc: "http request",
|
||||
uri: "http://example.com",
|
||||
uri: "http://example.com" + CORS_SJS_PATH,
|
||||
visibleOnNewEvent: false,
|
||||
visibleOnSecurityInfo: false,
|
||||
visibleOnceComplete: false,
|
||||
}, {
|
||||
desc: "working https request",
|
||||
uri: "https://example.com",
|
||||
uri: "https://example.com" + CORS_SJS_PATH,
|
||||
visibleOnNewEvent: false,
|
||||
visibleOnSecurityInfo: true,
|
||||
visibleOnceComplete: true,
|
||||
|
@ -44,6 +44,7 @@ const CONTENT_TYPE_SJS = EXAMPLE_URL + "sjs_content-type-test-server.sjs";
|
||||
const STATUS_CODES_SJS = EXAMPLE_URL + "sjs_status-codes-test-server.sjs";
|
||||
const SORTING_SJS = EXAMPLE_URL + "sjs_sorting-test-server.sjs";
|
||||
const HTTPS_REDIRECT_SJS = EXAMPLE_URL + "sjs_https-redirect-test-server.sjs";
|
||||
const CORS_SJS_PATH = "/browser/browser/devtools/netmonitor/test/sjs_cors-test-server.sjs";
|
||||
|
||||
const TEST_IMAGE = EXAMPLE_URL + "test-image.png";
|
||||
const TEST_IMAGE_DATA_URI = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==";
|
||||
|
16
browser/devtools/netmonitor/test/sjs_cors-test-server.sjs
Normal file
16
browser/devtools/netmonitor/test/sjs_cors-test-server.sjs
Normal file
@ -0,0 +1,16 @@
|
||||
/* Any copyright is dedicated to the Public Domain.
|
||||
http://creativecommons.org/publicdomain/zero/1.0/ */
|
||||
|
||||
function handleRequest(request, response) {
|
||||
response.setStatusLine(request.httpVersion, 200, "Och Aye");
|
||||
|
||||
response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
|
||||
response.setHeader("Pragma", "no-cache");
|
||||
response.setHeader("Expires", "0");
|
||||
|
||||
response.setHeader("Access-Control-Allow-Origin", "*", false);
|
||||
|
||||
response.setHeader("Content-Type", "text/plain; charset=utf-8", false);
|
||||
|
||||
response.write("Access-Control-Allow-Origin: *");
|
||||
}
|
@ -6,6 +6,7 @@ function handleRequest(request, response) {
|
||||
response.setHeader("Pragma", "no-cache");
|
||||
response.setHeader("Expires", "0");
|
||||
|
||||
response.setHeader("Access-Control-Allow-Origin", "*", false);
|
||||
|
||||
if (request.scheme === "http") {
|
||||
response.setStatusLine(request.httpVersion, 302, "Found");
|
||||
|
Loading…
Reference in New Issue
Block a user