Bug 1210208 - Intermittent browser_cmd_highlight_01.js | This test exceeded the timeout threshold.; r=miker
MozReview-Commit-ID: CIDclgvGylo
--- a/devtools/client/commandline/test/browser.ini
+++ b/devtools/client/commandline/test/browser.ini
@@ -49,18 +49,18 @@ support-files =
browser_cmd_csscoverage_page2.html
browser_cmd_csscoverage_page3.html
browser_cmd_csscoverage_sheetA.css
browser_cmd_csscoverage_sheetB.css
browser_cmd_csscoverage_sheetC.css
browser_cmd_csscoverage_sheetD.css
[browser_cmd_folder.js]
[browser_cmd_highlight_01.js]
-skip-if = os == "linux" && debug # Bug 1210208
[browser_cmd_highlight_02.js]
+[browser_cmd_highlight_03.js]
[browser_cmd_inject.js]
support-files =
browser_cmd_inject.html
[browser_cmd_csscoverage_util.js]
[browser_cmd_jsb.js]
support-files =
browser_cmd_jsb_script.jsi
[browser_cmd_listen.js]
--- a/devtools/client/commandline/test/browser_cmd_highlight_01.js
+++ b/devtools/client/commandline/test/browser_cmd_highlight_01.js
@@ -2,17 +2,17 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// Tests the various highlight command parameters and options
// Creating a test page with many elements to test the --showall option
var TEST_PAGE = "data:text/html;charset=utf-8,<body><ul>";
-for (let i = 0; i < 200; i ++) {
+for (let i = 0; i < 101; i ++) {
TEST_PAGE += "<li class='item'>" + i + "</li>";
}
TEST_PAGE += "</ul></body>";
function test() {
return Task.spawn(spawnTest).then(finish, helpers.handleError);
}
@@ -53,148 +53,52 @@ function* spawnTest() {
markup: 'VVVVVVVVVVVVVV',
status: 'VALID'
},
exec: {
output: '1 node highlighted'
}
},
{
- setup: 'highlight body --hide',
- check: {
- input: 'highlight body --hide',
- hints: 'guides [options]',
- markup: 'VVVVVVVVVVVVVVVIIIIII',
- status: 'ERROR'
- },
- exec: {
- output: 'Error: Too many arguments'
- }
- },
- {
setup: 'highlight body --hideguides',
check: {
input: 'highlight body --hideguides',
hints: ' [options]',
markup: 'VVVVVVVVVVVVVVVVVVVVVVVVVVV',
status: 'VALID'
},
exec: {
output: '1 node highlighted'
}
},
{
- setup: 'highlight body --show',
- check: {
- input: 'highlight body --show',
- hints: 'infobar [options]',
- markup: 'VVVVVVVVVVVVVVVIIIIII',
- status: 'ERROR'
- },
- exec: {
- output: 'Error: Too many arguments'
- }
- },
- {
setup: 'highlight body --showinfobar',
check: {
input: 'highlight body --showinfobar',
hints: ' [options]',
markup: 'VVVVVVVVVVVVVVVVVVVVVVVVVVVV',
status: 'VALID'
},
exec: {
output: '1 node highlighted'
}
},
{
- setup: 'highlight body --showa',
- check: {
- input: 'highlight body --showa',
- hints: 'll [options]',
- markup: 'VVVVVVVVVVVVVVVIIIIIII',
- status: 'ERROR'
- },
- exec: {
- output: 'Error: Too many arguments'
- }
- },
- {
setup: 'highlight body --showall',
check: {
input: 'highlight body --showall',
hints: ' [options]',
markup: 'VVVVVVVVVVVVVVVVVVVVVVVV',
status: 'VALID'
},
exec: {
output: '1 node highlighted'
}
},
{
- setup: 'highlight body --r',
- check: {
- input: 'highlight body --r',
- hints: 'egion [options]',
- markup: 'VVVVVVVVVVVVVVVIII',
- status: 'ERROR'
- },
- exec: {
- output: 'Error: Too many arguments'
- }
- },
- {
- setup: 'highlight body --region',
- check: {
- input: 'highlight body --region',
- hints: ' <selection> [options]',
- markup: 'VVVVVVVVVVVVVVVIIIIIIII',
- status: 'ERROR'
- },
- exec: {
- output: 'Error: Value required for \'region\'.'
- }
- },
- {
- setup: 'highlight body --fi',
- check: {
- input: 'highlight body --fi',
- hints: 'll [options]',
- markup: 'VVVVVVVVVVVVVVVIIII',
- status: 'ERROR'
- },
- exec: {
- output: 'Error: Too many arguments'
- }
- },
- {
- setup: 'highlight body --fill',
- check: {
- input: 'highlight body --fill',
- hints: ' <string> [options]',
- markup: 'VVVVVVVVVVVVVVVIIIIII',
- status: 'ERROR'
- },
- exec: {
- output: 'Error: Value required for \'fill\'.'
- }
- },
- {
- setup: 'highlight body --ke',
- check: {
- input: 'highlight body --ke',
- hints: 'ep [options]',
- markup: 'VVVVVVVVVVVVVVVIIII',
- status: 'ERROR'
- },
- exec: {
- output: 'Error: Too many arguments'
- }
- },
- {
setup: 'highlight body --keep',
check: {
input: 'highlight body --keep',
hints: ' [options]',
markup: 'VVVVVVVVVVVVVVVVVVVVV',
status: 'VALID'
},
exec: {
@@ -220,38 +124,29 @@ function* spawnTest() {
setup: 'highlight .item',
check: {
input: 'highlight .item',
hints: ' [options]',
markup: 'VVVVVVVVVVVVVVV',
status: 'VALID'
},
exec: {
- output: '200 nodes matched, but only 100 nodes highlighted. Use ' +
+ output: '101 nodes matched, but only 100 nodes highlighted. Use ' +
'\'--showall\' to show all'
}
},
{
setup: 'highlight .item --showall',
check: {
input: 'highlight .item --showall',
hints: ' [options]',
markup: 'VVVVVVVVVVVVVVVVVVVVVVVVV',
status: 'VALID'
},
exec: {
- output: '200 nodes highlighted'
- }
- },
- {
- setup: 'unhighlight',
- check: {
- input: 'unhighlight',
- hints: '',
- markup: 'VVVVVVVVVVV',
- status: 'VALID'
+ output: '101 nodes highlighted'
}
}
]);
yield helpers.closeToolbar(options);
yield helpers.closeTab(options);
}
new file mode 100644
--- /dev/null
+++ b/devtools/client/commandline/test/browser_cmd_highlight_03.js
@@ -0,0 +1,129 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Tests the various highlight command parameters and options that doesn't
+// involve nodes at all.
+
+var TEST_PAGE = "data:text/html;charset=utf-8,";
+
+function test() {
+ return Task.spawn(spawnTest).then(finish, helpers.handleError);
+}
+
+function* spawnTest() {
+ let options = yield helpers.openTab(TEST_PAGE);
+ yield helpers.openToolbar(options);
+
+ yield helpers.audit(options, [
+ {
+ setup: 'highlight body --hide',
+ check: {
+ input: 'highlight body --hide',
+ hints: 'guides [options]',
+ markup: 'VVVVVVVVVVVVVVVIIIIII',
+ status: 'ERROR'
+ },
+ exec: {
+ output: 'Error: Too many arguments'
+ }
+ },
+ {
+ setup: 'highlight body --show',
+ check: {
+ input: 'highlight body --show',
+ hints: 'infobar [options]',
+ markup: 'VVVVVVVVVVVVVVVIIIIII',
+ status: 'ERROR'
+ },
+ exec: {
+ output: 'Error: Too many arguments'
+ }
+ },
+ {
+ setup: 'highlight body --showa',
+ check: {
+ input: 'highlight body --showa',
+ hints: 'll [options]',
+ markup: 'VVVVVVVVVVVVVVVIIIIIII',
+ status: 'ERROR'
+ },
+ exec: {
+ output: 'Error: Too many arguments'
+ }
+ },
+ {
+ setup: 'highlight body --r',
+ check: {
+ input: 'highlight body --r',
+ hints: 'egion [options]',
+ markup: 'VVVVVVVVVVVVVVVIII',
+ status: 'ERROR'
+ },
+ exec: {
+ output: 'Error: Too many arguments'
+ }
+ },
+ {
+ setup: 'highlight body --region',
+ check: {
+ input: 'highlight body --region',
+ hints: ' <selection> [options]',
+ markup: 'VVVVVVVVVVVVVVVIIIIIIII',
+ status: 'ERROR'
+ },
+ exec: {
+ output: 'Error: Value required for \'region\'.'
+ }
+ },
+ {
+ setup: 'highlight body --fi',
+ check: {
+ input: 'highlight body --fi',
+ hints: 'll [options]',
+ markup: 'VVVVVVVVVVVVVVVIIII',
+ status: 'ERROR'
+ },
+ exec: {
+ output: 'Error: Too many arguments'
+ }
+ },
+ {
+ setup: 'highlight body --fill',
+ check: {
+ input: 'highlight body --fill',
+ hints: ' <string> [options]',
+ markup: 'VVVVVVVVVVVVVVVIIIIII',
+ status: 'ERROR'
+ },
+ exec: {
+ output: 'Error: Value required for \'fill\'.'
+ }
+ },
+ {
+ setup: 'highlight body --ke',
+ check: {
+ input: 'highlight body --ke',
+ hints: 'ep [options]',
+ markup: 'VVVVVVVVVVVVVVVIIII',
+ status: 'ERROR'
+ },
+ exec: {
+ output: 'Error: Too many arguments'
+ }
+ },
+ {
+ setup: 'unhighlight',
+ check: {
+ input: 'unhighlight',
+ hints: '',
+ markup: 'VVVVVVVVVVV',
+ status: 'VALID'
+ }
+ }
+ ]);
+
+ yield helpers.closeToolbar(options);
+ yield helpers.closeTab(options);
+}