Bug 1074205 - Enable devtools/netmonitor tests with e10s, r=ejpbruel

This commit is contained in:
Victor Porof 2014-11-05 16:52:56 -05:00
parent 5be0882642
commit be0670c340
3 changed files with 5 additions and 12 deletions

View File

@ -1,5 +1,4 @@
[DEFAULT]
skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
subsuite = devtools
support-files =
head.js

View File

@ -13,9 +13,9 @@ function test() {
"curl",
"'" + SIMPLE_SJS + "'",
"-H 'Host: example.com'",
"-H 'User-Agent: " + aDebuggee.navigator.userAgent + "'",
"-H 'User-Agent: " + navigator.userAgent + "'",
"-H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'",
"-H 'Accept-Language: " + aDebuggee.navigator.language + "'",
"-H 'Accept-Language: " + navigator.language + "'",
"--compressed",
"-H 'X-Custom-Header-1: Custom value'",
"-H 'X-Custom-Header-2: 8.8.8.8'",
@ -28,9 +28,9 @@ function test() {
'curl',
'"' + SIMPLE_SJS + '"',
'-H "Host: example.com"',
'-H "User-Agent: ' + aDebuggee.navigator.userAgent + '"',
'-H "User-Agent: ' + navigator.userAgent + '"',
'-H "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"',
'-H "Accept-Language: ' + aDebuggee.navigator.language + '"',
'-H "Accept-Language: ' + navigator.language + '"',
"--compressed",
'-H "X-Custom-Header-1: Custom value"',
'-H "X-Custom-Header-2: 8.8.8.8"',

View File

@ -52,13 +52,7 @@ function test() {
teardown(aMonitor).then(finish);
});
aDebuggee.get(Math.random(), () => {
// Timeout needed for having enough divisions on the time scale.
setTimeout(() => {
aDebuggee.get(Math.random(), () => {
// Done.
});
}, 3000);
});
aDebuggee.performRequests(2, null, 3000);
});
}