зеркало из https://github.com/mozilla/gecko-dev.git
Bug 483382 - browser_480148.js causes browser_420786.js to fail
This commit is contained in:
Родитель
0d39e46fc6
Коммит
4632404cfd
|
@ -46,7 +46,6 @@ include $(DEPTH)/config/autoconf.mk
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
# browser_477657.js is disabled, because it's unreliable (bug 482975).
|
# browser_477657.js is disabled, because it's unreliable (bug 482975).
|
||||||
# browser_480148.js is disabled, because it breaks browser_420786.js (see bug 483382).
|
|
||||||
|
|
||||||
_BROWSER_TEST_FILES = \
|
_BROWSER_TEST_FILES = \
|
||||||
browser_248970_a.js \
|
browser_248970_a.js \
|
||||||
|
@ -97,6 +96,7 @@ _BROWSER_TEST_FILES = \
|
||||||
browser_466937_sample.html \
|
browser_466937_sample.html \
|
||||||
browser_476161.js \
|
browser_476161.js \
|
||||||
browser_476161_sample.html \
|
browser_476161_sample.html \
|
||||||
|
browser_480148.js \
|
||||||
browser_480893.js \
|
browser_480893.js \
|
||||||
browser_483330.js \
|
browser_483330.js \
|
||||||
browser_485482.js \
|
browser_485482.js \
|
||||||
|
|
|
@ -1,22 +1,9 @@
|
||||||
const Ci = Components.interfaces;
|
|
||||||
const Cc = Components.classes;
|
|
||||||
|
|
||||||
const DG_BACKGROUND = "/desktop/gnome/background"
|
const DG_BACKGROUND = "/desktop/gnome/background"
|
||||||
const DG_IMAGE_KEY = DG_BACKGROUND + "/picture_filename";
|
const DG_IMAGE_KEY = DG_BACKGROUND + "/picture_filename";
|
||||||
const DG_OPTION_KEY = DG_BACKGROUND + "/picture_options";
|
const DG_OPTION_KEY = DG_BACKGROUND + "/picture_options";
|
||||||
const DG_DRAW_BG_KEY = DG_BACKGROUND + "/draw_background";
|
const DG_DRAW_BG_KEY = DG_BACKGROUND + "/draw_background";
|
||||||
|
|
||||||
var testPage;
|
|
||||||
|
|
||||||
function url(spec) {
|
|
||||||
var ios = Cc["@mozilla.org/network/io-service;1"].
|
|
||||||
getService(Ci.nsIIOService);
|
|
||||||
return ios.newURI(spec, null, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
function onPageLoad() {
|
function onPageLoad() {
|
||||||
testPage.events.removeListener("load", onPageLoad);
|
|
||||||
|
|
||||||
var bs = Cc["@mozilla.org/intl/stringbundle;1"].
|
var bs = Cc["@mozilla.org/intl/stringbundle;1"].
|
||||||
getService(Ci.nsIStringBundleService);
|
getService(Ci.nsIStringBundleService);
|
||||||
var brandName = bs.createBundle("chrome://branding/locale/brand.properties").
|
var brandName = bs.createBundle("chrome://branding/locale/brand.properties").
|
||||||
|
@ -49,7 +36,7 @@ function onPageLoad() {
|
||||||
var prevOptionKey = gconf.getString(DG_OPTION_KEY);
|
var prevOptionKey = gconf.getString(DG_OPTION_KEY);
|
||||||
var prevDrawBgKey = gconf.getBool(DG_DRAW_BG_KEY);
|
var prevDrawBgKey = gconf.getBool(DG_DRAW_BG_KEY);
|
||||||
|
|
||||||
var image = testPage.document.getElementsByTagName("img")[0];
|
var image = content.document.images[0];
|
||||||
|
|
||||||
function checkWallpaper(position, expectedGConfPosition) {
|
function checkWallpaper(position, expectedGConfPosition) {
|
||||||
shell.setDesktopBackground(image, position);
|
shell.setDesktopBackground(image, position);
|
||||||
|
@ -72,10 +59,10 @@ function onPageLoad() {
|
||||||
gconf.setBool(DG_DRAW_BG_KEY, prevDrawBgKey);
|
gconf.setBool(DG_DRAW_BG_KEY, prevDrawBgKey);
|
||||||
|
|
||||||
wpFile.remove(false);
|
wpFile.remove(false);
|
||||||
if (wpFileBackup.exists()) {
|
if (wpFileBackup.exists())
|
||||||
wpFileBackup.moveTo(null, wpFile.leafName);
|
wpFileBackup.moveTo(null, wpFile.leafName);
|
||||||
}
|
|
||||||
testPage.close();
|
gBrowser.removeCurrentTab();
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -84,15 +71,12 @@ function test() {
|
||||||
getService(Ci.nsIXULRuntime).OS;
|
getService(Ci.nsIXULRuntime).OS;
|
||||||
|
|
||||||
// This test is Linux specific for now
|
// This test is Linux specific for now
|
||||||
if (osString != "Linux") {
|
if (osString != "Linux")
|
||||||
finish();
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
testPage = Application.activeWindow.open(url("about:blank"));
|
gBrowser.selectedTab = gBrowser.addTab();
|
||||||
testPage.events.addListener("load", onPageLoad);
|
gBrowser.selectedBrowser.addEventListener("load", onPageLoad, true);
|
||||||
testPage.load(url("about:logo"));
|
content.location = "about:logo";
|
||||||
testPage.focus();
|
|
||||||
|
|
||||||
waitForExplicitFinish();
|
waitForExplicitFinish();
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче