Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1355207 - Improve test_host.js and add diagnostic info to figure out where it times out r=kershaw

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D14055

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Valentin Gosu 2018-12-12 23:22:35 +00:00
parent 61a51a3800
commit 01d0b7c15e
2 changed files with 36 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
netwerk/test/httpserver/test/head_utils.js
View File

@ -374,8 +374,10 @@ function RawTest(host, port, data, responseCheck) {
* an array of RawTests to run, in order
* @param done
* function to call when all tests have run (e.g. to shut down the server)
* @param beforeTestCallback
* function to call before each test is run. Gets passed testIndex when called
*/
function runRawTests(testArray, done) {
function runRawTests(testArray, done, beforeTestCallback) {
do_test_pending();
var sts = Cc["@mozilla.org/network/socket-transport-service;1"]
@ -397,6 +399,11 @@ function runRawTests(testArray, done) {
return;
}
if (beforeTestCallback) {
try {
beforeTestCallback(testIndex);
} catch (e) { /* We don't care if this call fails */ }
}
var rawTest = testArray[testIndex];

73
netwerk/test/httpserver/test/test_host.js
View File

@ -9,14 +9,16 @@
* and used in HTTP requests and responses.
*/
"use strict";
const PORT = 4444;
const FAKE_PORT_ONE = 8888;
const FAKE_PORT_TWO = 8889;
var srv, id;
let srv, id;
function run_test() {
dumpn("*** run_test");
add_task(async function run_test1() {
dump("*** run_test1");
srv = createServer();
@ -76,21 +78,12 @@ function run_test() {
// Okay, now that we've exercised that behavior, shut down the server and
// restart it on the correct port, to exercise port-changing behaviors at
// server start and stop.
do_test_pending();
srv.stop(function() {
try {
do_test_pending();
run_test_2();
} finally {
do_test_finished();
}
});
}
function run_test_2() {
dumpn("*** run_test_2");
await new Promise(resolve => srv.stop(resolve));
});
do_test_finished();
add_task(async function run_test_2() {
dump("*** run_test_2");
// Our primary location is gone because it was dependent on the port on which
// the server was running.
@ -134,21 +127,11 @@ function run_test_2() {
Assert.ok(!id.has("http", "localhost", FAKE_PORT_ONE));
Assert.ok(!id.has("http", "127.0.0.1", FAKE_PORT_ONE));
do_test_pending();
srv.stop(function() {
try {
do_test_pending();
run_test_3();
} finally {
do_test_finished();
}
});
}
await new Promise(resolve => srv.stop(resolve));
});
function run_test_3() {
dumpn("*** run_test_3");
do_test_finished();
add_task(async function run_test_3() {
dump("*** run_test_3");
// Only the default added location disappears; any others stay around,
// possibly as the primary location. We may have removed the default primary
@ -197,8 +180,8 @@ function run_test_3() {
// Okay, finally done with identity testing. Our primary location is the one
// we want it to be, so we're off!
runRawTests(tests, testComplete(srv));
}
runRawTests(tests, () => { srv.stop(); }, (idx) => dump(`running test no ${idx}`));
});
/** *******************
@ -213,7 +196,7 @@ function run_test_3() {
* the server identity to test
*/
function checkPrimariesThrow(aId) {
var threw = false;
let threw = false;
try {
aId.primaryScheme;
} catch (e) {
@ -242,10 +225,10 @@ function checkPrimariesThrow(aId) {
* Utility function to check for a 400 response.
*/
function check400(aData) {
var iter = LineIterator(aData);
let iter = LineIterator(aData);
// Status-Line
var { value: firstLine } = iter.next();
let { value: firstLine } = iter.next();
Assert.equal(firstLine.substring(0, HTTP_400_LEADER_LENGTH), HTTP_400_LEADER);
}
@ -269,7 +252,7 @@ function http10Request(request, response) {
data = "GET /http/1.0-request HTTP/1.0\r\n" +
"\r\n";
function check10(aData) {
var iter = LineIterator(aData);
let iter = LineIterator(aData);
// Status-Line
Assert.equal(iter.next().value, "HTTP/1.0 200 TEST PASSED");
@ -277,7 +260,7 @@ function check10(aData) {
skipHeaders(iter);
// Okay, next line must be the data we expected to be written
var body =
let body =
[
"Method: GET",
"Path: /http/1.0-request",
@ -366,7 +349,7 @@ data = "GET /http/1.1-good-host HTTP/1.1\r\n" +
"Host: localhost:4444\r\n" +
"\r\n";
function check11goodHost(aData) {
var iter = LineIterator(aData);
let iter = LineIterator(aData);
// Status-Line
Assert.equal(iter.next().value, "HTTP/1.1 200 TEST PASSED");
@ -374,7 +357,7 @@ function check11goodHost(aData) {
skipHeaders(iter);
// Okay, next line must be the data we expected to be written
var body =
let body =
[
"Method: GET",
"Path: /http/1.1-good-host",
@ -401,7 +384,7 @@ data = "GET /http/1.1-ip-host HTTP/1.1\r\n" +
"Host: 127.0.0.1:4444\r\n" +
"\r\n";
function check11ipHost(aData) {
var iter = LineIterator(aData);
let iter = LineIterator(aData);
// Status-Line
Assert.equal(iter.next().value, "HTTP/1.1 200 TEST PASSED");
@ -409,7 +392,7 @@ function check11ipHost(aData) {
skipHeaders(iter);
// Okay, next line must be the data we expected to be written
var body =
let body =
[
"Method: GET",
"Path: /http/1.1-ip-host",
@ -484,7 +467,7 @@ data = "GET /http/1.0-request HTTP/1.0\r\n" +
"Host: not-localhost:4444\r\n" +
"\r\n";
function check10ip(aData) {
var iter = LineIterator(aData);
let iter = LineIterator(aData);
// Status-Line
Assert.equal(iter.next().value, "HTTP/1.0 200 TEST PASSED");
@ -492,7 +475,7 @@ function check10ip(aData) {
skipHeaders(iter);
// Okay, next line must be the data we expected to be written
var body =
let body =
[
"Method: GET",
"Path: /http/1.0-request",
@ -519,7 +502,7 @@ data = "GET /http/1.1-good-host-wacky-port HTTP/1.1\r\n" +
"Host: localhost\r\n" +
"\r\n";
function check11goodHostWackyPort(aData) {
var iter = LineIterator(aData);
let iter = LineIterator(aData);
// Status-Line
Assert.equal(iter.next().value, "HTTP/1.1 200 TEST PASSED");
@ -527,7 +510,7 @@ function check11goodHostWackyPort(aData) {
skipHeaders(iter);
// Okay, next line must be the data we expected to be written
var body =
let body =
[
"Method: GET",
"Path: /http/1.1-good-host-wacky-port",