xpcshell test fixup - Bug 843497 - Update check says 'up to date' for out of date versions on unsupported OS versions. r=me for test fixup

This commit is contained in:
Robert Strong 2013-06-22 13:37:20 -07:00
Родитель 65a4446066
Коммит 65352e3bec
4 изменённых файлов: 1 добавлений и 9 удалений

Просмотреть файл

@ -20,7 +20,7 @@ const XML_PREFIX = "<updates xmlns=\"http://www.mozilla.org/2005/app-update\""
"extensionVersion=\"1.0\" installDate=\"1238441400314\" " +
"isCompleteUpdate=\"true\" name=\"Update Test 1.0\" " +
"serviceURL=\"https://example.com/\" showNeverForVersion=" +
"\"false\" showPrompt=\"false\" showSurvey=\"false\" type=" +
"\"false\" showPrompt=\"false\" type=" +
"\"minor\" version=\"version 1.0\" detailsURL=" +
"\"http://example.com/\" previousAppVersion=\"1.0\" " +
"statusText=\"The Update was successfully installed\" " +

Просмотреть файл

@ -315,7 +315,6 @@ function getUpdateString(aType, aName, aDisplayVersion, aAppVersion,
let promptWaitTime = aPromptWaitTime ? "promptWaitTime=\"" + aPromptWaitTime +
"\" "
: "";
let showSurvey = aShowSurvey ? "showSurvey=\"" + aShowSurvey + "\" " : "";
let custom1 = aCustom1 ? aCustom1 + " " : "";
let custom2 = aCustom2 ? aCustom2 + " " : "";
return " <update type=\"" + type + "\" " +
@ -331,7 +330,6 @@ function getUpdateString(aType, aName, aDisplayVersion, aAppVersion,
showPrompt +
showNeverForVersion +
promptWaitTime +
showSurvey +
custom1 +
custom2 +
"buildID=\"" + buildID + "\"";

Просмотреть файл

@ -119,7 +119,6 @@ function check_test_pt02() {
do_check_true(bestUpdate.showPrompt);
do_check_true(bestUpdate.showNeverForVersion);
do_check_eq(bestUpdate.promptWaitTime, "345600");
do_check_true(bestUpdate.showSurvey);
do_check_eq(bestUpdate.serviceURL, URL_HOST + "update.xml?force=1");
do_check_eq(bestUpdate.channel, "test_channel");
do_check_false(bestUpdate.isCompleteUpdate);
@ -200,7 +199,6 @@ function check_test_pt03() {
do_check_true(bestUpdate.showPrompt);
do_check_true(bestUpdate.showNeverForVersion);
do_check_eq(bestUpdate.promptWaitTime, "691200");
do_check_false(bestUpdate.showSurvey);
do_check_eq(bestUpdate.serviceURL, URL_HOST + "update.xml?force=1");
do_check_eq(bestUpdate.channel, "test_channel");
do_check_false(bestUpdate.isCompleteUpdate);

Просмотреть файл

@ -71,7 +71,6 @@ function run_test() {
do_check_true(update.showPrompt);
do_check_true(update.showNeverForVersion);
do_check_eq(update.promptWaitTime, "345600");
do_check_true(update.showSurvey);
do_check_eq(update.previousAppVersion, "3.0");
// Custom attributes
do_check_eq(update.getProperty("custom1_attr"), "custom1 value");
@ -105,7 +104,6 @@ function run_test() {
do_check_true(update.showPrompt);
do_check_true(update.showNeverForVersion);
do_check_eq(update.promptWaitTime, "691200");
do_check_false(update.showSurvey);
do_check_eq(update.previousAppVersion, null);
// Custom attributes
do_check_eq(update.getProperty("custom3_attr"), "custom3 value");
@ -172,7 +170,6 @@ function run_test() {
do_check_true(update.showPrompt);
do_check_true(update.showNeverForVersion);
do_check_eq(update.promptWaitTime, "100");
do_check_true(update.showSurvey);
do_check_eq(update.previousAppVersion, "3.0");
patch = update.selectedPatch;
@ -203,7 +200,6 @@ function run_test() {
do_check_false(update.showPrompt);
do_check_false(update.showNeverForVersion);
do_check_eq(update.promptWaitTime, "200");
do_check_false(update.showSurvey);
do_check_eq(update.previousAppVersion, null);
patch = update.selectedPatch;