зеркало из https://github.com/mozilla/gecko-dev.git
bug 1361102 - split out tests so they are more deterministic when updating the application update xml files asynchronously. r=dothayer
--HG-- rename : toolkit/mozapps/update/tests/unit_aus_update/downloadInterruptedRecovery.js => toolkit/mozapps/update/tests/unit_aus_update/downloadInterruptedNoRecovery.js rename : toolkit/mozapps/update/tests/unit_aus_update/downloadInterruptedRecovery.js => toolkit/mozapps/update/tests/unit_aus_update/downloadInterruptedOffline.js rename : toolkit/mozapps/update/tests/unit_aus_update/downloadInvalidMar.js => toolkit/mozapps/update/tests/unit_aus_update/downloadInvalidSizeMar.js rename : toolkit/mozapps/update/tests/unit_aus_update/downloadInvalidMar.js => toolkit/mozapps/update/tests/unit_aus_update/downloadMissingMar.js
This commit is contained in:
Robert Strong
Родитель
cd662f7515
Коммит
2b9b13e6c9
|
|
@ -0,0 +1,223 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
/* General MAR File Download Tests */
|
||||
|
||||
Components.utils.import("resource://testing-common/MockRegistrar.jsm");
|
||||
const INC_CONTRACT_ID = "@mozilla.org/network/incremental-download;1";
|
||||
|
||||
// gIncrementalDownloadErrorType is used to loop through each of the connection
|
||||
// error types in the Mock incremental downloader.
|
||||
var gIncrementalDownloadErrorType = 0;
|
||||
|
||||
var gNextRunFunc;
|
||||
var gExpectedStatusResult;
|
||||
|
||||
function run_test() {
|
||||
setupTestCommon();
|
||||
|
||||
debugDump("testing mar downloads and mar download interrupted recovery");
|
||||
|
||||
Services.prefs.setBoolPref(PREF_APP_UPDATE_STAGING_ENABLED, false);
|
||||
start_httpserver();
|
||||
setUpdateURL(gURLData + gHTTPHandlerPath);
|
||||
standardInit();
|
||||
do_execute_soon(run_test_pt1);
|
||||
}
|
||||
|
||||
// The HttpServer must be stopped before calling do_test_finished
|
||||
function finish_test() {
|
||||
stop_httpserver(doTestFinish);
|
||||
}
|
||||
|
||||
// Helper function for testing mar downloads that have the correct size
|
||||
// specified in the update xml.
|
||||
function run_test_helper_pt1(aMsg, aExpectedStatusResult, aNextRunFunc) {
|
||||
gUpdates = null;
|
||||
gUpdateCount = null;
|
||||
gStatusResult = null;
|
||||
gCheckFunc = check_test_helper_pt1_1;
|
||||
gNextRunFunc = aNextRunFunc;
|
||||
gExpectedStatusResult = aExpectedStatusResult;
|
||||
debugDump(aMsg, Components.stack.caller);
|
||||
gUpdateChecker.checkForUpdates(updateCheckListener, true);
|
||||
}
|
||||
|
||||
function check_test_helper_pt1_1() {
|
||||
Assert.equal(gUpdateCount, 1,
|
||||
"the update count" + MSG_SHOULD_EQUAL);
|
||||
gCheckFunc = check_test_helper_pt1_2;
|
||||
let bestUpdate = gAUS.selectUpdate(gUpdates, gUpdateCount);
|
||||
let state = gAUS.downloadUpdate(bestUpdate, false);
|
||||
if (state == STATE_NONE || state == STATE_FAILED) {
|
||||
do_throw("nsIApplicationUpdateService:downloadUpdate returned " + state);
|
||||
}
|
||||
gAUS.addDownloadListener(downloadListener);
|
||||
}
|
||||
|
||||
function check_test_helper_pt1_2() {
|
||||
Assert.equal(gStatusResult, gExpectedStatusResult,
|
||||
"the download status result" + MSG_SHOULD_EQUAL);
|
||||
gAUS.removeDownloadListener(downloadListener);
|
||||
gNextRunFunc();
|
||||
}
|
||||
|
||||
function setResponseBody() {
|
||||
let patches = getRemotePatchString({});
|
||||
let updates = getRemoteUpdateString({}, patches);
|
||||
gResponseBody = getRemoteUpdatesXMLString(updates);
|
||||
}
|
||||
|
||||
function initMockIncrementalDownload() {
|
||||
let incrementalDownloadCID =
|
||||
MockRegistrar.register(INC_CONTRACT_ID, IncrementalDownload);
|
||||
do_register_cleanup(() => {
|
||||
MockRegistrar.unregister(incrementalDownloadCID);
|
||||
});
|
||||
}
|
||||
|
||||
/* This Mock incremental downloader is used to verify that connection
|
||||
* interrupts work correctly in updater code. The implementation of
|
||||
* the mock incremental downloader is very simple, it simply copies
|
||||
* the file to the destination location.
|
||||
*/
|
||||
|
||||
function IncrementalDownload() {
|
||||
this.wrappedJSObject = this;
|
||||
}
|
||||
|
||||
IncrementalDownload.prototype = {
|
||||
/* nsIIncrementalDownload */
|
||||
init(uri, file, chunkSize, intervalInSeconds) {
|
||||
this._destination = file;
|
||||
this._URI = uri;
|
||||
this._finalURI = uri;
|
||||
},
|
||||
|
||||
start(observer, ctxt) {
|
||||
let tm = Cc["@mozilla.org/thread-manager;1"].
|
||||
getService(Ci.nsIThreadManager);
|
||||
// Do the actual operation async to give a chance for observers
|
||||
// to add themselves.
|
||||
tm.dispatchToMainThread(() => {
|
||||
this._observer = observer.QueryInterface(Ci.nsIRequestObserver);
|
||||
this._ctxt = ctxt;
|
||||
this._observer.onStartRequest(this, this._ctxt);
|
||||
let mar = getTestDirFile(FILE_SIMPLE_MAR);
|
||||
mar.copyTo(this._destination.parent, this._destination.leafName);
|
||||
let status = Cr.NS_OK;
|
||||
switch (gIncrementalDownloadErrorType++) {
|
||||
case 0:
|
||||
status = Cr.NS_ERROR_NET_RESET;
|
||||
break;
|
||||
case 1:
|
||||
status = Cr.NS_ERROR_CONNECTION_REFUSED;
|
||||
break;
|
||||
case 2:
|
||||
status = Cr.NS_ERROR_NET_RESET;
|
||||
break;
|
||||
case 3:
|
||||
status = Cr.NS_OK;
|
||||
break;
|
||||
case 4:
|
||||
status = Cr.NS_ERROR_OFFLINE;
|
||||
// After we report offline, we want to eventually show offline
|
||||
// status being changed to online.
|
||||
let tm2 = Cc["@mozilla.org/thread-manager;1"].
|
||||
getService(Ci.nsIThreadManager);
|
||||
tm2.dispatchToMainThread(function() {
|
||||
Services.obs.notifyObservers(gAUS,
|
||||
"network:offline-status-changed",
|
||||
"online");
|
||||
});
|
||||
break;
|
||||
}
|
||||
this._observer.onStopRequest(this, this._ctxt, status);
|
||||
});
|
||||
},
|
||||
|
||||
get URI() {
|
||||
return this._URI;
|
||||
},
|
||||
|
||||
get currentSize() {
|
||||
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
|
||||
},
|
||||
|
||||
get destination() {
|
||||
return this._destination;
|
||||
},
|
||||
|
||||
get finalURI() {
|
||||
return this._finalURI;
|
||||
},
|
||||
|
||||
get totalSize() {
|
||||
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
|
||||
},
|
||||
|
||||
/* nsIRequest */
|
||||
cancel(aStatus) {
|
||||
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
|
||||
},
|
||||
suspend() {
|
||||
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
|
||||
},
|
||||
isPending() {
|
||||
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
|
||||
},
|
||||
_loadFlags: 0,
|
||||
get loadFlags() {
|
||||
return this._loadFlags;
|
||||
},
|
||||
set loadFlags(val) {
|
||||
this._loadFlags = val;
|
||||
},
|
||||
|
||||
_loadGroup: null,
|
||||
get loadGroup() {
|
||||
return this._loadGroup;
|
||||
},
|
||||
set loadGroup(val) {
|
||||
this._loadGroup = val;
|
||||
},
|
||||
|
||||
_name: "",
|
||||
get name() {
|
||||
return this._name;
|
||||
},
|
||||
|
||||
_status: 0,
|
||||
get status() {
|
||||
return this._status;
|
||||
},
|
||||
QueryInterface: XPCOMUtils.generateQI([Ci.nsIIncrementalDownload])
|
||||
};
|
||||
|
||||
// Test disconnecting during an update
|
||||
function run_test_pt1() {
|
||||
initMockIncrementalDownload();
|
||||
setResponseBody();
|
||||
run_test_helper_pt1("mar download with connection interruption",
|
||||
Cr.NS_OK, run_test_pt2);
|
||||
}
|
||||
|
||||
// Test disconnecting during an update
|
||||
function run_test_pt2() {
|
||||
gIncrementalDownloadErrorType = 0;
|
||||
Services.prefs.setIntPref(PREF_APP_UPDATE_SOCKET_MAXERRORS, 2);
|
||||
Services.prefs.setIntPref(PREF_APP_UPDATE_RETRYTIMEOUT, 0);
|
||||
setResponseBody();
|
||||
run_test_helper_pt1("mar download with connection interruption without recovery",
|
||||
Cr.NS_ERROR_NET_RESET, run_test_pt3);
|
||||
}
|
||||
|
||||
// Test entering offline mode while downloading
|
||||
function run_test_pt3() {
|
||||
gIncrementalDownloadErrorType = 4;
|
||||
setResponseBody();
|
||||
run_test_helper_pt1("mar download with offline mode",
|
||||
Cr.NS_OK, finish_test);
|
||||
}
|
||||
|
|
@ -0,0 +1,223 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
/* General MAR File Download Tests */
|
||||
|
||||
Components.utils.import("resource://testing-common/MockRegistrar.jsm");
|
||||
const INC_CONTRACT_ID = "@mozilla.org/network/incremental-download;1";
|
||||
|
||||
// gIncrementalDownloadErrorType is used to loop through each of the connection
|
||||
// error types in the Mock incremental downloader.
|
||||
var gIncrementalDownloadErrorType = 0;
|
||||
|
||||
var gNextRunFunc;
|
||||
var gExpectedStatusResult;
|
||||
|
||||
function run_test() {
|
||||
setupTestCommon();
|
||||
|
||||
debugDump("testing mar downloads and mar download interrupted recovery");
|
||||
|
||||
Services.prefs.setBoolPref(PREF_APP_UPDATE_STAGING_ENABLED, false);
|
||||
start_httpserver();
|
||||
setUpdateURL(gURLData + gHTTPHandlerPath);
|
||||
standardInit();
|
||||
do_execute_soon(run_test_pt1);
|
||||
}
|
||||
|
||||
// The HttpServer must be stopped before calling do_test_finished
|
||||
function finish_test() {
|
||||
stop_httpserver(doTestFinish);
|
||||
}
|
||||
|
||||
// Helper function for testing mar downloads that have the correct size
|
||||
// specified in the update xml.
|
||||
function run_test_helper_pt1(aMsg, aExpectedStatusResult, aNextRunFunc) {
|
||||
gUpdates = null;
|
||||
gUpdateCount = null;
|
||||
gStatusResult = null;
|
||||
gCheckFunc = check_test_helper_pt1_1;
|
||||
gNextRunFunc = aNextRunFunc;
|
||||
gExpectedStatusResult = aExpectedStatusResult;
|
||||
debugDump(aMsg, Components.stack.caller);
|
||||
gUpdateChecker.checkForUpdates(updateCheckListener, true);
|
||||
}
|
||||
|
||||
function check_test_helper_pt1_1() {
|
||||
Assert.equal(gUpdateCount, 1,
|
||||
"the update count" + MSG_SHOULD_EQUAL);
|
||||
gCheckFunc = check_test_helper_pt1_2;
|
||||
let bestUpdate = gAUS.selectUpdate(gUpdates, gUpdateCount);
|
||||
let state = gAUS.downloadUpdate(bestUpdate, false);
|
||||
if (state == STATE_NONE || state == STATE_FAILED) {
|
||||
do_throw("nsIApplicationUpdateService:downloadUpdate returned " + state);
|
||||
}
|
||||
gAUS.addDownloadListener(downloadListener);
|
||||
}
|
||||
|
||||
function check_test_helper_pt1_2() {
|
||||
Assert.equal(gStatusResult, gExpectedStatusResult,
|
||||
"the download status result" + MSG_SHOULD_EQUAL);
|
||||
gAUS.removeDownloadListener(downloadListener);
|
||||
gNextRunFunc();
|
||||
}
|
||||
|
||||
function setResponseBody() {
|
||||
let patches = getRemotePatchString({});
|
||||
let updates = getRemoteUpdateString({}, patches);
|
||||
gResponseBody = getRemoteUpdatesXMLString(updates);
|
||||
}
|
||||
|
||||
function initMockIncrementalDownload() {
|
||||
let incrementalDownloadCID =
|
||||
MockRegistrar.register(INC_CONTRACT_ID, IncrementalDownload);
|
||||
do_register_cleanup(() => {
|
||||
MockRegistrar.unregister(incrementalDownloadCID);
|
||||
});
|
||||
}
|
||||
|
||||
/* This Mock incremental downloader is used to verify that connection
|
||||
* interrupts work correctly in updater code. The implementation of
|
||||
* the mock incremental downloader is very simple, it simply copies
|
||||
* the file to the destination location.
|
||||
*/
|
||||
|
||||
function IncrementalDownload() {
|
||||
this.wrappedJSObject = this;
|
||||
}
|
||||
|
||||
IncrementalDownload.prototype = {
|
||||
/* nsIIncrementalDownload */
|
||||
init(uri, file, chunkSize, intervalInSeconds) {
|
||||
this._destination = file;
|
||||
this._URI = uri;
|
||||
this._finalURI = uri;
|
||||
},
|
||||
|
||||
start(observer, ctxt) {
|
||||
let tm = Cc["@mozilla.org/thread-manager;1"].
|
||||
getService(Ci.nsIThreadManager);
|
||||
// Do the actual operation async to give a chance for observers
|
||||
// to add themselves.
|
||||
tm.dispatchToMainThread(() => {
|
||||
this._observer = observer.QueryInterface(Ci.nsIRequestObserver);
|
||||
this._ctxt = ctxt;
|
||||
this._observer.onStartRequest(this, this._ctxt);
|
||||
let mar = getTestDirFile(FILE_SIMPLE_MAR);
|
||||
mar.copyTo(this._destination.parent, this._destination.leafName);
|
||||
let status = Cr.NS_OK;
|
||||
switch (gIncrementalDownloadErrorType++) {
|
||||
case 0:
|
||||
status = Cr.NS_ERROR_NET_RESET;
|
||||
break;
|
||||
case 1:
|
||||
status = Cr.NS_ERROR_CONNECTION_REFUSED;
|
||||
break;
|
||||
case 2:
|
||||
status = Cr.NS_ERROR_NET_RESET;
|
||||
break;
|
||||
case 3:
|
||||
status = Cr.NS_OK;
|
||||
break;
|
||||
case 4:
|
||||
status = Cr.NS_ERROR_OFFLINE;
|
||||
// After we report offline, we want to eventually show offline
|
||||
// status being changed to online.
|
||||
let tm2 = Cc["@mozilla.org/thread-manager;1"].
|
||||
getService(Ci.nsIThreadManager);
|
||||
tm2.dispatchToMainThread(function() {
|
||||
Services.obs.notifyObservers(gAUS,
|
||||
"network:offline-status-changed",
|
||||
"online");
|
||||
});
|
||||
break;
|
||||
}
|
||||
this._observer.onStopRequest(this, this._ctxt, status);
|
||||
});
|
||||
},
|
||||
|
||||
get URI() {
|
||||
return this._URI;
|
||||
},
|
||||
|
||||
get currentSize() {
|
||||
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
|
||||
},
|
||||
|
||||
get destination() {
|
||||
return this._destination;
|
||||
},
|
||||
|
||||
get finalURI() {
|
||||
return this._finalURI;
|
||||
},
|
||||
|
||||
get totalSize() {
|
||||
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
|
||||
},
|
||||
|
||||
/* nsIRequest */
|
||||
cancel(aStatus) {
|
||||
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
|
||||
},
|
||||
suspend() {
|
||||
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
|
||||
},
|
||||
isPending() {
|
||||
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
|
||||
},
|
||||
_loadFlags: 0,
|
||||
get loadFlags() {
|
||||
return this._loadFlags;
|
||||
},
|
||||
set loadFlags(val) {
|
||||
this._loadFlags = val;
|
||||
},
|
||||
|
||||
_loadGroup: null,
|
||||
get loadGroup() {
|
||||
return this._loadGroup;
|
||||
},
|
||||
set loadGroup(val) {
|
||||
this._loadGroup = val;
|
||||
},
|
||||
|
||||
_name: "",
|
||||
get name() {
|
||||
return this._name;
|
||||
},
|
||||
|
||||
_status: 0,
|
||||
get status() {
|
||||
return this._status;
|
||||
},
|
||||
QueryInterface: XPCOMUtils.generateQI([Ci.nsIIncrementalDownload])
|
||||
};
|
||||
|
||||
// Test disconnecting during an update
|
||||
function run_test_pt1() {
|
||||
initMockIncrementalDownload();
|
||||
setResponseBody();
|
||||
run_test_helper_pt1("mar download with connection interruption",
|
||||
Cr.NS_OK, run_test_pt2);
|
||||
}
|
||||
|
||||
// Test disconnecting during an update
|
||||
function run_test_pt2() {
|
||||
gIncrementalDownloadErrorType = 0;
|
||||
Services.prefs.setIntPref(PREF_APP_UPDATE_SOCKET_MAXERRORS, 2);
|
||||
Services.prefs.setIntPref(PREF_APP_UPDATE_RETRYTIMEOUT, 0);
|
||||
setResponseBody();
|
||||
run_test_helper_pt1("mar download with connection interruption without recovery",
|
||||
Cr.NS_ERROR_NET_RESET, run_test_pt3);
|
||||
}
|
||||
|
||||
// Test entering offline mode while downloading
|
||||
function run_test_pt3() {
|
||||
gIncrementalDownloadErrorType = 4;
|
||||
setResponseBody();
|
||||
run_test_helper_pt1("mar download with offline mode",
|
||||
Cr.NS_OK, finish_test);
|
||||
}
|
||||
|
|
@ -0,0 +1,81 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
var gNextRunFunc;
|
||||
var gExpectedStatusResult;
|
||||
|
||||
function run_test() {
|
||||
// The network code that downloads the mar file accesses the profile to cache
|
||||
// the download, but the profile is only available after calling
|
||||
// do_get_profile in xpcshell tests. This prevents an error from being logged.
|
||||
do_get_profile();
|
||||
|
||||
setupTestCommon();
|
||||
|
||||
debugDump("testing invalid mar downloads");
|
||||
|
||||
Services.prefs.setBoolPref(PREF_APP_UPDATE_STAGING_ENABLED, false);
|
||||
start_httpserver();
|
||||
setUpdateURL(gURLData + gHTTPHandlerPath);
|
||||
standardInit();
|
||||
do_execute_soon(run_test_pt1);
|
||||
}
|
||||
|
||||
// The HttpServer must be stopped before calling do_test_finished
|
||||
function finish_test() {
|
||||
stop_httpserver(doTestFinish);
|
||||
}
|
||||
|
||||
// Helper function for testing mar downloads that have the correct size
|
||||
// specified in the update xml.
|
||||
function run_test_helper_pt1(aMsg, aExpectedStatusResult, aNextRunFunc) {
|
||||
gUpdates = null;
|
||||
gUpdateCount = null;
|
||||
gStatusResult = null;
|
||||
gCheckFunc = check_test_helper_pt1_1;
|
||||
gNextRunFunc = aNextRunFunc;
|
||||
gExpectedStatusResult = aExpectedStatusResult;
|
||||
debugDump(aMsg, Components.stack.caller);
|
||||
gUpdateChecker.checkForUpdates(updateCheckListener, true);
|
||||
}
|
||||
|
||||
function check_test_helper_pt1_1() {
|
||||
Assert.equal(gUpdateCount, 1,
|
||||
"the update count" + MSG_SHOULD_EQUAL);
|
||||
gCheckFunc = check_test_helper_pt1_2;
|
||||
let bestUpdate = gAUS.selectUpdate(gUpdates, gUpdateCount);
|
||||
let state = gAUS.downloadUpdate(bestUpdate, false);
|
||||
if (state == STATE_NONE || state == STATE_FAILED) {
|
||||
do_throw("nsIApplicationUpdateService:downloadUpdate returned " + state);
|
||||
}
|
||||
gAUS.addDownloadListener(downloadListener);
|
||||
}
|
||||
|
||||
function check_test_helper_pt1_2() {
|
||||
Assert.equal(gStatusResult, gExpectedStatusResult,
|
||||
"the download status result" + MSG_SHOULD_EQUAL);
|
||||
gAUS.removeDownloadListener(downloadListener);
|
||||
gNextRunFunc();
|
||||
}
|
||||
|
||||
// mar download with the mar not found
|
||||
function run_test_pt1() {
|
||||
let patchProps = {url: gURLData + "missing.mar"};
|
||||
let patches = getRemotePatchString(patchProps);
|
||||
let updates = getRemoteUpdateString({}, patches);
|
||||
gResponseBody = getRemoteUpdatesXMLString(updates);
|
||||
run_test_helper_pt1("mar download with the mar not found",
|
||||
Cr.NS_ERROR_UNEXPECTED, run_test_pt2);
|
||||
}
|
||||
|
||||
// mar download with an invalid file size
|
||||
function run_test_pt2() {
|
||||
let patchProps = {size: "1024000"};
|
||||
let patches = getRemotePatchString(patchProps);
|
||||
let updates = getRemoteUpdateString({}, patches);
|
||||
gResponseBody = getRemoteUpdatesXMLString(updates);
|
||||
run_test_helper_pt1("mar download with an invalid file size",
|
||||
Cr.NS_ERROR_UNEXPECTED, finish_test);
|
||||
}
|
||||
Загрузка…
Ссылка в новой задаче