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

Backed out changeset 438881cf9dac (bug 1330553) for making test_fullscreen-api.html permatimeout on e10s Linux

Browse Source 
CLOSED TREE
This commit is contained in:
Phil Ringnalda 2017-02-07 18:35:21 -08:00
parent dcdc8e9897
commit a5ec383cac
2 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/html/test/mochitest.ini
View File

@ -441,7 +441,7 @@ skip-if = toolkit == 'android'
[test_formelements.html]
[test_fullscreen-api.html]
tags = fullscreen
skip-if = toolkit == 'android'
skip-if = toolkit == 'android' || (e10s && os == 'linux') # Bug 1307347
support-files =
file_fullscreen-api.html
file_fullscreen-backdrop.html

38
dom/html/test/test_fullscreen-api.html
View File

@ -62,35 +62,19 @@ function nextTest() {
SimpleTest.executeSoon(runNextTest);
}
function shouldSkipTest(test) {
if (test == "file_fullscreen-plugins.html") {
if (!SpecialPowers.isMainProcess() &&
navigator.platform.indexOf('Linux') >= 0) {
// Bug 1330553
return true;
}
}
return false;
}
function runNextTest() {
if (gTestIndex < gTestWindows.length) {
let test = gTestWindows[gTestIndex];
if (shouldSkipTest(test)) {
info(`Skip test ${test}`);
} else {
info(`Run test ${test}`);
testWindow = window.open(test, "", "width=500,height=500,scrollbars=yes");
// We'll wait for the window to load, then make sure our window is refocused
// before starting the test, which will get kicked off on "focus".
// This ensures that we're essentially back on the primary "desktop" on
// OS X Lion before we run the test.
testWindow.addEventListener("load", function() {
SimpleTest.waitForFocus(function() {
SimpleTest.waitForFocus(testWindow.begin, testWindow);
});
}, {once: true});
}
info("Run test " + gTestWindows[gTestIndex]);
testWindow = window.open(gTestWindows[gTestIndex], "", "width=500,height=500,scrollbars=yes");
// We'll wait for the window to load, then make sure our window is refocused
// before starting the test, which will get kicked off on "focus".
// This ensures that we're essentially back on the primary "desktop" on
// OS X Lion before we run the test.
testWindow.addEventListener("load", function() {
SimpleTest.waitForFocus(function() {
SimpleTest.waitForFocus(testWindow.begin, testWindow);
});
}, {once: true});
gTestIndex++;
} else {
SimpleTest.finish();