wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 864993 - Part 2: Properly implement app update collection; r=rnewman

Browse Source
This commit is contained in:
Gregory Szorc 2013-07-18 16:13:43 -07:00
parent b5d3af5ed3
commit e45624870f
4 changed files with 79 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
services/healthreport/modules-testing/utils.jsm
View File

@ -10,17 +10,21 @@ this.EXPORTED_SYMBOLS = [
"makeFakeAppDir",
"createFakeCrash",
"InspectedHealthReporter",
"getHealthReporter",
];
const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
Cu.import("resource://gre/modules/Preferences.jsm");
Cu.import("resource://gre/modules/Promise.jsm");
Cu.import("resource://gre/modules/FileUtils.jsm");
Cu.import("resource://gre/modules/osfile.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/services-common/utils.js");
Cu.import("resource://gre/modules/HealthReport.jsm");
Cu.import("resource://gre/modules/services/datareporting/policy.jsm");
Cu.import("resource://gre/modules/services/healthreport/healthreporter.jsm");
Cu.import("resource://gre/modules/services/healthreport/providers.jsm");
let APP_INFO = {
@ -267,3 +271,33 @@ InspectedHealthReporter.prototype = {
},
};
const DUMMY_URI="http://localhost:62013/";
this.getHealthReporter = function (name, uri=DUMMY_URI, inspected=false) {
let branch = "healthreport.testing." + name + ".";
let prefs = new Preferences(branch + "healthreport.");
prefs.set("documentServerURI", uri);
prefs.set("dbName", name);
let reporter;
let policyPrefs = new Preferences(branch + "policy.");
let policy = new DataReportingPolicy(policyPrefs, prefs, {
onRequestDataUpload: function (request) {
reporter.requestDataUpload(request);
},
onNotifyDataPolicy: function (request) { },
onRequestRemoteDelete: function (request) {
reporter.deleteRemoteData(request);
},
});
let type = inspected ? InspectedHealthReporter : HealthReporter;
reporter = new type(branch + "healthreport.", policy, null,
"state-" + name + ".json");
return reporter;
};

14
services/healthreport/providers.jsm
View File

@ -393,14 +393,16 @@ AppInfoProvider.prototype = Object.freeze({
},
collectDailyData: function () {
let m = this.getMeasurement(AppUpdateMeasurement1.prototype.name,
AppUpdateMeasurement1.prototype.version);
return this.storage.enqueueTransaction(function getDaily() {
let m = this.getMeasurement(AppUpdateMeasurement1.prototype.name,
AppUpdateMeasurement1.prototype.version);
let enabled = this._prefs.get("app.update.enabled", false);
yield m.setDailyLastNumeric("enabled", enabled ? 1 : 0);
let enabled = this._prefs.get("app.update.enabled", false);
yield m.setDailyLastNumeric("enabled", enabled ? 1 : 0);
let auto = this._prefs.get("app.update.auto", false);
yield m.setDailyLastNumeric("autoDownload", auto ? 1 : 0);
let auto = this._prefs.get("app.update.auto", false);
yield m.setDailyLastNumeric("autoDownload", auto ? 1 : 0);
}.bind(this));
},
});

58
services/healthreport/tests/xpcshell/test_healthreporter.js
View File

@ -40,39 +40,9 @@ function defineNow(policy, now) {
});
}
function getJustReporter(name, uri=SERVER_URI, inspected=false) {
let branch = "healthreport.testing." + name + ".";
let prefs = new Preferences(branch + "healthreport.");
prefs.set("documentServerURI", uri);
prefs.set("dbName", name);
let reporter;
let policyPrefs = new Preferences(branch + "policy.");
let policy = new DataReportingPolicy(policyPrefs, prefs, {
onRequestDataUpload: function (request) {
reporter.requestDataUpload(request);
},
onNotifyDataPolicy: function (request) { },
onRequestRemoteDelete: function (request) {
reporter.deleteRemoteData(request);
},
});
let type = inspected ? InspectedHealthReporter : HealthReporter;
// Define per-instance state file so tests don't interfere with each other.
reporter = new type(branch + "healthreport.", policy, null,
"state-" + name + ".json");
return reporter;
}
function getReporter(name, uri, inspected) {
return Task.spawn(function init() {
let reporter = getJustReporter(name, uri, inspected);
let reporter = getHealthReporter(name, uri, inspected);
yield reporter.init();
yield reporter._providerManager.registerProviderFromType(
@ -167,7 +137,7 @@ add_task(function test_shutdown_normal() {
});
add_task(function test_shutdown_storage_in_progress() {
let reporter = yield getJustReporter("shutdown_storage_in_progress", SERVER_URI, true);
let reporter = yield getHealthReporter("shutdown_storage_in_progress", SERVER_URI, true);
reporter.onStorageCreated = function () {
print("Faking shutdown during storage initialization.");
@ -184,8 +154,8 @@ add_task(function test_shutdown_storage_in_progress() {
// Ensure that a shutdown triggered while provider manager is initializing
// results in shutdown and storage closure.
add_task(function test_shutdown_provider_manager_in_progress() {
let reporter = yield getJustReporter("shutdown_provider_manager_in_progress",
SERVER_URI, true);
let reporter = yield getHealthReporter("shutdown_provider_manager_in_progress",
SERVER_URI, true);
reporter.onProviderManagerInitialized = function () {
print("Faking shutdown during provider manager initialization.");
@ -202,7 +172,7 @@ add_task(function test_shutdown_provider_manager_in_progress() {
// Simulates an error during provider manager initialization and verifies we shut down.
add_task(function test_shutdown_when_provider_manager_errors() {
let reporter = yield getJustReporter("shutdown_when_provider_manager_errors",
let reporter = yield getHealthReporter("shutdown_when_provider_manager_errors",
SERVER_URI, true);
reporter.onInitializeProviderManagerFinished = function () {
@ -286,7 +256,7 @@ add_task(function test_collect_daily() {
});
add_task(function test_remove_old_lastpayload() {
let reporter = getJustReporter("remove-old-lastpayload");
let reporter = getHealthReporter("remove-old-lastpayload");
let lastPayloadPath = reporter._state._lastPayloadPath;
let paths = [lastPayloadPath, lastPayloadPath + ".tmp"];
let createFiles = function () {
@ -311,7 +281,7 @@ add_task(function test_remove_old_lastpayload() {
do_check_true(o.removedOutdatedLastpayload);
yield createFiles();
reporter = getJustReporter("remove-old-lastpayload");
reporter = getHealthReporter("remove-old-lastpayload");
yield reporter.init();
for (let path of paths) {
do_check_true(yield OS.File.exists(path));
@ -824,7 +794,7 @@ add_task(function test_basic_appinfo() {
// Ensure collection occurs if upload is disabled.
add_task(function test_collect_when_upload_disabled() {
let reporter = getJustReporter("collect_when_upload_disabled");
let reporter = getHealthReporter("collect_when_upload_disabled");
reporter._policy.recordHealthReportUploadEnabled(false, "testing-collect");
do_check_false(reporter._policy.healthReportUploadEnabled);
@ -873,7 +843,7 @@ add_task(function test_failure_if_not_initialized() {
});
add_task(function test_upload_on_init_failure() {
let reporter = yield getJustReporter("upload_on_init_failure", SERVER_URI, true);
let reporter = yield getHealthReporter("upload_on_init_failure", SERVER_URI, true);
let server = new BagheeraServer(SERVER_URI);
server.createNamespace(reporter.serverNamespace);
server.start(SERVER_PORT);
@ -924,7 +894,7 @@ add_task(function test_upload_on_init_failure() {
});
add_task(function test_state_prefs_conversion_simple() {
let reporter = getJustReporter("state_prefs_conversion");
let reporter = getHealthReporter("state_prefs_conversion");
let prefs = reporter._prefs;
let lastSubmit = new Date();
@ -952,7 +922,7 @@ add_task(function test_state_prefs_conversion_simple() {
// If the saved JSON file does not contain an object, we should reset
// automatically.
add_task(function test_state_no_json_object() {
let reporter = getJustReporter("state_shared");
let reporter = getHealthReporter("state_shared");
yield CommonUtils.writeJSON("hello", reporter._state._filename);
try {
@ -973,7 +943,7 @@ add_task(function test_state_no_json_object() {
// If we encounter a future version, we reset state to the current version.
add_task(function test_state_future_version() {
let reporter = getJustReporter("state_shared");
let reporter = getHealthReporter("state_shared");
yield CommonUtils.writeJSON({v: 2, remoteIDs: ["foo"], lastPingTime: 2412},
reporter._state._filename);
try {
@ -994,7 +964,7 @@ add_task(function test_state_future_version() {
// Test recovery if the state file contains invalid JSON.
add_task(function test_state_invalid_json() {
let reporter = getJustReporter("state_shared");
let reporter = getHealthReporter("state_shared");
let encoder = new TextEncoder();
let arr = encoder.encode("{foo: bad value, 'bad': as2,}");
@ -1055,7 +1025,7 @@ add_task(function test_state_multiple_remote_ids() {
// If we have a state file then downgrade to prefs, the prefs should be
// reimported and should supplement existing state.
add_task(function test_state_downgrade_upgrade() {
let reporter = getJustReporter("state_shared");
let reporter = getHealthReporter("state_shared");
let now = new Date();

22
services/healthreport/tests/xpcshell/test_provider_appinfo.js
View File

@ -250,3 +250,25 @@ add_task(function test_record_app_update () {
yield provider.shutdown();
yield storage.close();
});
add_task(function test_healthreporter_integration () {
let reporter = getHealthReporter("healthreporter_integration");
yield reporter.init();
try {
yield reporter._providerManager.registerProviderFromType(AppInfoProvider);
yield reporter.collectMeasurements();
let payload = yield reporter.getJSONPayload(true);
let days = payload['data']['days'];
for (let [day, measurements] in Iterator(days)) {
do_check_eq(Object.keys(measurements).length, 3);
do_check_true("org.mozilla.appInfo.appinfo" in measurements);
do_check_true("org.mozilla.appInfo.update" in measurements);
do_check_true("org.mozilla.appInfo.versions" in measurements);
}
} finally {
reporter._shutdown();
}
});