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

Test only fix - Bug 553763 - [SeaMonkey 2.1] mochitest-chrome: bug 530872 update ui tests time out. r=me

Browse Source
This commit is contained in:
Robert Strong 2010-04-06 19:49:46 -07:00
parent 6b2f26dbdf
commit c17d07d7f8
19 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolkit/mozapps/update/test/chrome/test_0011_check_billboard_noLicense_noAddons.xul
View File

@ -65,7 +65,7 @@ function test01() {
removeUpdateDirsAndFiles();
reloadUpdateManagerData();
var queryString = "?showBillboard=1&showDetails=1";
var queryString = "?showBillboard=1&showDetails=1" + getVersionParams();
setUpdateURLOverride(URL_UPDATE + queryString);
gNextFunc = test02;

3
toolkit/mozapps/update/test/chrome/test_0012_check_billboard_noAddons.xul
View File

@ -65,7 +65,8 @@ function test01() {
removeUpdateDirsAndFiles();
reloadUpdateManagerData();
var queryString = "?showBillboard=1&showLicense=1&showDetails=1";
var queryString = "?showBillboard=1&showLicense=1&showDetails=1" +
getVersionParams();
setUpdateURLOverride(URL_UPDATE + queryString);
gNextFunc = test02;

2
toolkit/mozapps/update/test/chrome/test_0021_check_noBillboard_noLicense_noAddons.xul
View File

@ -65,7 +65,7 @@ function test01() {
removeUpdateDirsAndFiles();
reloadUpdateManagerData();
var queryString = "?showDetails=1";
var queryString = "?showDetails=1" + getVersionParams();
setUpdateURLOverride(URL_UPDATE + queryString);
gNextFunc = test02;

2
toolkit/mozapps/update/test/chrome/test_0022_check_noBillboard_noAddons.xul
View File

@ -65,7 +65,7 @@ function test01() {
removeUpdateDirsAndFiles();
reloadUpdateManagerData();
var queryString = "?showLicense=1&showDetails=1";
var queryString = "?showLicense=1&showDetails=1" + getVersionParams();
setUpdateURLOverride(URL_UPDATE + queryString);
gNextFunc = test02;

3
toolkit/mozapps/update/test/chrome/test_0031_available_billboard_noLicense_noAddons.xul
View File

@ -66,7 +66,8 @@ function test01() {
reloadUpdateManagerData();
gPref.setIntPref(PREF_APP_UPDATE_IDLETIME, 0);
var queryString = "?showBillboard=1&showDetails=1&showPrompt=1";
var queryString = "?showBillboard=1&showDetails=1&showPrompt=1" +
getVersionParams();
setUpdateURLOverride(URL_UPDATE + queryString);
gNextFunc = test02;

3
toolkit/mozapps/update/test/chrome/test_0032_available_billboard_noAddons.xul
View File

@ -66,7 +66,8 @@ function test01() {
reloadUpdateManagerData();
gPref.setIntPref(PREF_APP_UPDATE_IDLETIME, 0);
var queryString = "?showBillboard=1&showLicense=1&showDetails=1&showPrompt=1";
var queryString = "?showBillboard=1&showLicense=1&showDetails=1" +
"&showPrompt=1" + getVersionParams();
setUpdateURLOverride(URL_UPDATE + queryString);
gNextFunc = test02;

2
toolkit/mozapps/update/test/chrome/test_0041_available_noBillboard_noLicense_noAddons.xul
View File

@ -66,7 +66,7 @@ function test01() {
reloadUpdateManagerData();
gPref.setIntPref(PREF_APP_UPDATE_IDLETIME, 0);
var queryString = "?showDetails=1&showPrompt=1";
var queryString = "?showDetails=1&showPrompt=1" + getVersionParams();
setUpdateURLOverride(URL_UPDATE + queryString);
gNextFunc = test02;

3
toolkit/mozapps/update/test/chrome/test_0042_available_noBillboard_noAddons.xul
View File

@ -66,7 +66,8 @@ function test01() {
reloadUpdateManagerData();
gPref.setIntPref(PREF_APP_UPDATE_IDLETIME, 0);
var queryString = "?showLicense=1&showDetails=1&showPrompt=1";
var queryString = "?showLicense=1&showDetails=1&showPrompt=1" +
getVersionParams();
setUpdateURLOverride(URL_UPDATE + queryString);
gNextFunc = test02;

3
toolkit/mozapps/update/test/chrome/test_0053_check_billboard_license_noAttr.xul
View File

@ -65,7 +65,8 @@ function test01() {
removeUpdateDirsAndFiles();
reloadUpdateManagerData();
var queryString = "?showBillboard=1&showLicense=1&remoteNoTypeAttr=1&showDetails=1";
var queryString = "?showBillboard=1&showLicense=1&remoteNoTypeAttr=1" +
"&showDetails=1" + getVersionParams();
setUpdateURLOverride(URL_UPDATE + queryString);
gNextFunc = test02;

3
toolkit/mozapps/update/test/chrome/test_0054_check_billboard_license_404.xul
View File

@ -65,7 +65,8 @@ function test01() {
removeUpdateDirsAndFiles();
reloadUpdateManagerData();
var queryString = "?billboard404=1&license404=1&showDetails=1";
var queryString = "?billboard404=1&license404=1&showDetails=1" +
getVersionParams();
setUpdateURLOverride(URL_UPDATE + queryString);
gNextFunc = test02;

3
toolkit/mozapps/update/test/chrome/test_0081_error_patchApplyFailure_partial_only.xul
View File

@ -64,7 +64,8 @@ function test01() {
var patches = getLocalPatchString("partial", null, null, null, null, null,
STATE_PENDING);
var updates = getLocalUpdateString(patches, "Existing", "major");
var updates = getLocalUpdateString(patches, null, null, null,
gApp.version, gApp.platformVersion);
writeUpdatesToXMLFile(getLocalUpdatesXMLString(updates), true);

3
toolkit/mozapps/update/test/chrome/test_0082_error_patchApplyFailure_complete_only.xul
View File

@ -64,7 +64,8 @@ function test01() {
var patches = getLocalPatchString("complete", null, null, null, null, null,
STATE_PENDING);
var updates = getLocalUpdateString(patches, "Existing", "major");
var updates = getLocalUpdateString(patches, null, null, null,
gApp.version, gApp.platformVersion);
writeUpdatesToXMLFile(getLocalUpdatesXMLString(updates), true);

3
toolkit/mozapps/update/test/chrome/test_0083_error_patchApplyFailure_partial_complete.xul
View File

@ -68,7 +68,8 @@ function test01() {
var patches = getLocalPatchString("partial", null, null, null, null, null,
STATE_PENDING) +
getLocalPatchString("complete", slowDownloadURL);
var updates = getLocalUpdateString(patches);
var updates = getLocalUpdateString(patches, null, null, null,
gApp.version, gApp.platformVersion);
writeUpdatesToXMLFile(getLocalUpdatesXMLString(updates), true);

4
toolkit/mozapps/update/test/chrome/test_0084_error_patchApplyFailure_verify_failed.xul
View File

@ -69,8 +69,8 @@ function test01() {
STATE_PENDING) +
getLocalPatchString("complete", slowDownloadURL, "MD5",
"1234cd43a1c77e30191c53a329a3f99d");
var updates = getLocalUpdateString(patches);
var updates = getLocalUpdateString(patches, null, null, null,
gApp.version, gApp.platformVersion);
writeUpdatesToXMLFile(getLocalUpdatesXMLString(updates), true);

3
toolkit/mozapps/update/test/chrome/test_0091_installed.xul
View File

@ -65,7 +65,8 @@ function test01() {
gPref.setBoolPref(PREF_APP_UPDATE_SHOW_INSTALLED_UI, true);
var patches = getLocalPatchString("complete", null, null, null, null, null,
STATE_PENDING);
var updates = getLocalUpdateString(patches);
var updates = getLocalUpdateString(patches, null, null, null,
gApp.version, gApp.platformVersion);
writeUpdatesToXMLFile(getLocalUpdatesXMLString(updates), true);
writeUpdatesToXMLFile(getLocalUpdatesXMLString(""), false);
writeStatusFile(STATE_SUCCEEDED);

3
toolkit/mozapps/update/test/chrome/test_0092_finishedBackground.xul
View File

@ -64,7 +64,8 @@ function test01() {
var patches = getLocalPatchString("complete", null, null, null, null, null,
STATE_PENDING);
var updates = getLocalUpdateString(patches);
var updates = getLocalUpdateString(patches, null, null, null,
gApp.version, gApp.platformVersion);
writeUpdatesToXMLFile(getLocalUpdatesXMLString(updates), true);
writeUpdatesToXMLFile(getLocalUpdatesXMLString(""), false);
writeStatusFile(STATE_SUCCEEDED);

4
toolkit/mozapps/update/test/chrome/test_0111_neverButton_billboard.xul
View File

@ -56,7 +56,7 @@
SimpleTest.waitForExplicitFinish();
const gNeverPref = PREF_APP_UPDATE_NEVER_BRANCH + "99.9";
const gNeverPref = PREF_APP_UPDATE_NEVER_BRANCH + gApp.version;
/**
* test preparation
@ -70,7 +70,7 @@ function test01() {
removeUpdateDirsAndFiles();
reloadUpdateManagerData();
var queryString = "?showBillboard=1&showNever=1";
var queryString = "?showBillboard=1&showNever=1" + getVersionParams();
setUpdateURLOverride(URL_UPDATE + queryString);
// add the never preference for this version to verify that checking for

4
toolkit/mozapps/update/test/chrome/test_0112_neverButton_noBillboard.xul
View File

@ -56,7 +56,7 @@
SimpleTest.waitForExplicitFinish();
const gNeverPref = PREF_APP_UPDATE_NEVER_BRANCH + "99.9";
const gNeverPref = PREF_APP_UPDATE_NEVER_BRANCH + gApp.version;
/**
* test preparation
@ -70,7 +70,7 @@ function test01() {
removeUpdateDirsAndFiles();
reloadUpdateManagerData();
var queryString = "?showNever=1&showDetails=1";
var queryString = "?showNever=1&showDetails=1" + getVersionParams();
setUpdateURLOverride(URL_UPDATE + queryString);
// add the never preference for this version to verify that checking for

12
toolkit/mozapps/update/test/chrome/utils.js
View File

@ -104,6 +104,18 @@ __defineGetter__("gWW", function() {
});
__defineGetter__("gApp", function() {
delete this.gApp;
return this.gApp = AUS_Cc["@mozilla.org/xre/app-info;1"].
getService(AUS_Ci.nsIXULAppInfo).
QueryInterface(AUS_Ci.nsIXULRuntime);
});
function getVersionParams() {
return "&appVersion=" + gApp.version +
"&platformVersion=" + gApp.platformVersion;
}
/**
* Closes the update window in case a previous test failed to do so.
*/