Bug 987548 - Reduces the number of tests ran through ipc, to reduce intermittency. r=schien

This commit is contained in:
David Clarke 2014-03-27 22:28:00 +01:00
parent b9b0189812
commit d84efdf57d
3 changed files with 18 additions and 5 deletions

View File

@ -0,0 +1,9 @@
{
"runtests":{
"dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html":"included",
"dom/media/tests/mochitest/test_peerConnection_basicAudioVideo.html":"included",
"dom/media/tests/mochitest/test_dataChannel_basicAudioVideo.html":"included"
},
"excludetests":{
}
}

View File

@ -1,4 +1,7 @@
[DEFAULT]
support-files =
ipc.json
skip-if = e10s
[test_ipc.html]

View File

@ -31,7 +31,6 @@
function iframeScriptSecond() {
let TestRunner = content.wrappedJSObject.TestRunner;
let oldComplete = TestRunner.onComplete;
TestRunner.onComplete = function() {
@ -45,11 +44,13 @@
oldComplete();
}
};
let oldLog = TestRunner.log;
TestRunner.log = function(msg) {
sendAsyncMessage("test:PeerConnection:ipcTestMessage", { msg: msg });
}
};
TestRunner.error = function(msg) {
sendAsyncMessage("test:PeerConnection:ipcTestMessage", { msg: msg });
};
}
let regex = /^(TEST-PASS|TEST-UNEXPECTED-PASS|TEST-KNOWN-FAIL|TEST-UNEXPECTED-FAIL|TEST-DEBUG-INFO) \| ([^\|]+) \|(.*)/;
@ -148,8 +149,8 @@
let href = window.location.href;
href = href.substring(0, href.lastIndexOf('/'));
href = href.substring(0, href.lastIndexOf('/'));
iframe.src = href + "/mochitest?consoleLevel=INFO";
let manifest = "tests/dom/media/tests/ipc/ipc.json";
iframe.src = href + "/mochitest?consoleLevel=INFO&testManifest=" + manifest;
document.body.appendChild(iframe);
}