Bug 1243974 - [e10s] Enable browser_webconsole_output_01.js in e10s. r=bgrins

--HG--
extra : rebase_source : 1a1caa166d44ca87de913005ca082cc9f0440121
This commit is contained in:
Lin Clark 2016-02-16 15:21:00 -05:00
Родитель 7bcd6a2797
Коммит fde0887c81
4 изменённых файлов: 6 добавлений и 36 удалений

Просмотреть файл

@ -350,7 +350,6 @@ skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
[browser_console_hide_jsterm_when_devtools_chrome_enabled_false.js]
[browser_console_history_persist.js]
[browser_webconsole_output_01.js]
skip-if = e10s # Bug 1042253 - webconsole e10s tests
[browser_webconsole_output_02.js]
[browser_webconsole_output_03.js]
[browser_webconsole_output_04.js]

Просмотреть файл

@ -17,11 +17,6 @@ const TEST_URI = "data:text/html;charset=utf8,test for console output - 01";
var {DebuggerServer} = require("devtools/server/main");
var LONG_STRING_LENGTH = DebuggerServer.LONG_STRING_LENGTH;
var LONG_STRING_INITIAL_LENGTH = DebuggerServer.LONG_STRING_INITIAL_LENGTH;
DebuggerServer.LONG_STRING_LENGTH = 100;
DebuggerServer.LONG_STRING_INITIAL_LENGTH = 50;
var longString = (new Array(DebuggerServer.LONG_STRING_LENGTH + 4)).join("a");
var initialString = longString.substring(0, DebuggerServer.LONG_STRING_INITIAL_LENGTH);
@ -114,11 +109,6 @@ longString = initialString = null;
function test() {
requestLongerTimeout(2);
registerCleanupFunction(() => {
DebuggerServer.LONG_STRING_LENGTH = LONG_STRING_LENGTH;
DebuggerServer.LONG_STRING_INITIAL_LENGTH = LONG_STRING_INITIAL_LENGTH;
});
Task.spawn(function*() {
let {tab} = yield loadTab(TEST_URI);
let hud = yield openConsole(tab);

Просмотреть файл

@ -9,17 +9,6 @@
const TEST_URI = "data:text/html;charset=utf8,test for console and promises";
var {DebuggerServer} = require("devtools/server/main");
var LONG_STRING_LENGTH = DebuggerServer.LONG_STRING_LENGTH;
var LONG_STRING_INITIAL_LENGTH = DebuggerServer.LONG_STRING_INITIAL_LENGTH;
DebuggerServer.LONG_STRING_LENGTH = 100;
DebuggerServer.LONG_STRING_INITIAL_LENGTH = 50;
var longString = (new Array(DebuggerServer.LONG_STRING_LENGTH + 4)).join("a");
var initialString = longString.substring(0,
DebuggerServer.LONG_STRING_INITIAL_LENGTH);
var inputTests = [
// 0
{
@ -31,16 +20,9 @@ var inputTests = [
},
];
longString = initialString = null;
function test() {
requestLongerTimeout(2);
registerCleanupFunction(() => {
DebuggerServer.LONG_STRING_LENGTH = LONG_STRING_LENGTH;
DebuggerServer.LONG_STRING_INITIAL_LENGTH = LONG_STRING_INITIAL_LENGTH;
});
Task.spawn(function*() {
let {tab} = yield loadTab(TEST_URI);
let hud = yield openConsole(tab);
@ -49,6 +31,5 @@ function test() {
}
function finishUp() {
longString = initialString = inputTests = null;
finishTest();
}

Просмотреть файл

@ -1477,7 +1477,7 @@ function checkOutputForInputs(hud, inputTests) {
}
function* checkConsoleLog(entry) {
info("Logging: " + entry.input);
info("Logging");
hud.jsterm.clearOutput();
hud.jsterm.execute("console.log(" + entry.input + ")");
@ -1501,13 +1501,13 @@ function checkOutputForInputs(hud, inputTests) {
}
if (typeof entry.inspectorIcon == "boolean") {
info("Checking Inspector Link: " + entry.input);
info("Checking Inspector Link");
yield checkLinkToInspector(entry.inspectorIcon, msg);
}
}
function checkPrintOutput(entry) {
info("Printing: " + entry.input);
info("Printing");
hud.jsterm.clearOutput();
hud.jsterm.execute("print(" + entry.input + ")");
@ -1524,7 +1524,7 @@ function checkOutputForInputs(hud, inputTests) {
}
function* checkJSEval(entry) {
info("Evaluating: " + entry.input);
info("Evaluating");
hud.jsterm.clearOutput();
hud.jsterm.execute(entry.input);
@ -1550,7 +1550,7 @@ function checkOutputForInputs(hud, inputTests) {
}
function* checkObjectClick(entry, msg) {
info("Clicking: " + entry.input);
info("Clicking");
let body;
if (entry.getClickableNode) {
body = entry.getClickableNode(msg);
@ -1595,7 +1595,7 @@ function checkOutputForInputs(hud, inputTests) {
}
function onVariablesViewOpen(entry, {resolve, reject}, event, view, options) {
info("Variables view opened: " + entry.input);
info("Variables view opened");
let label = entry.variablesViewLabel || entry.output;
if (typeof label == "string" && options.label != label) {
return;