From 26a029d407be480d791972afb5975cf62c9360a6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 02:47:55 +0200 Subject: Adding upstream version 124.0.1. Signed-off-by: Daniel Baumann --- .../startup/tests/browser/beforeunload.html | 10 + .../components/startup/tests/browser/browser.toml | 14 + .../browser/browser_Telemetry_timestamp_test.js | 35 +++ .../startup/tests/browser/browser_bug511456.js | 58 ++++ .../startup/tests/browser/browser_bug537449.js | 58 ++++ .../tests/browser/browser_crash_detection.js | 30 ++ toolkit/components/startup/tests/browser/head.js | 28 ++ .../components/startup/tests/unit/head_startup.js | 39 +++ .../startup/tests/unit/test_startup_crash.js | 329 +++++++++++++++++++++ .../components/startup/tests/unit/xpcshell.toml | 5 + 10 files changed, 606 insertions(+) create mode 100644 toolkit/components/startup/tests/browser/beforeunload.html create mode 100644 toolkit/components/startup/tests/browser/browser.toml create mode 100644 toolkit/components/startup/tests/browser/browser_Telemetry_timestamp_test.js create mode 100644 toolkit/components/startup/tests/browser/browser_bug511456.js create mode 100644 toolkit/components/startup/tests/browser/browser_bug537449.js create mode 100644 toolkit/components/startup/tests/browser/browser_crash_detection.js create mode 100644 toolkit/components/startup/tests/browser/head.js create mode 100644 toolkit/components/startup/tests/unit/head_startup.js create mode 100644 toolkit/components/startup/tests/unit/test_startup_crash.js create mode 100644 toolkit/components/startup/tests/unit/xpcshell.toml (limited to 'toolkit/components/startup/tests') diff --git a/toolkit/components/startup/tests/browser/beforeunload.html b/toolkit/components/startup/tests/browser/beforeunload.html new file mode 100644 index 0000000000..81fa1b57bc --- /dev/null +++ b/toolkit/components/startup/tests/browser/beforeunload.html @@ -0,0 +1,10 @@ + + + + Test page + + diff --git a/toolkit/components/startup/tests/browser/browser.toml b/toolkit/components/startup/tests/browser/browser.toml new file mode 100644 index 0000000000..df89d33321 --- /dev/null +++ b/toolkit/components/startup/tests/browser/browser.toml @@ -0,0 +1,14 @@ +[DEFAULT] +support-files = [ + "head.js", + "beforeunload.html", +] + +["browser_Telemetry_timestamp_test.js"] + +["browser_bug511456.js"] +skip-if = ["os == 'linux' && bits == 64 && os_version == '18.04'"] # Bug 1334729, Bug 1546252; Bug 1582549 + +["browser_bug537449.js"] + +["browser_crash_detection.js"] diff --git a/toolkit/components/startup/tests/browser/browser_Telemetry_timestamp_test.js b/toolkit/components/startup/tests/browser/browser_Telemetry_timestamp_test.js new file mode 100644 index 0000000000..f009f2c941 --- /dev/null +++ b/toolkit/components/startup/tests/browser/browser_Telemetry_timestamp_test.js @@ -0,0 +1,35 @@ +"use strict"; + +const { TelemetryController } = ChromeUtils.importESModule( + "resource://gre/modules/TelemetryController.sys.mjs" +); +const { TelemetrySession } = ChromeUtils.importESModule( + "resource://gre/modules/TelemetrySession.sys.mjs" +); + +add_task(async function test() { + let now = Services.telemetry.msSinceProcessStart(); + let payload = TelemetrySession.getPayload("main"); + + // Check the first_paint scalar. + ok( + "scalars" in payload.processes.parent, + "Scalars are present in the payload." + ); + ok( + "timestamps.first_paint" in payload.processes.parent.scalars, + "The first_paint timestamp is present in the payload." + ); + Assert.greater( + payload.processes.parent.scalars["timestamps.first_paint"], + 0, + "first_paint scalar is greater than 0." + ); + Assert.greater(now, 0, "Browser test runtime is greater than zero."); + // Check that the first_paint scalar is less than the current time. + Assert.greater( + now, + payload.processes.parent.scalars["timestamps.first_paint"], + "first_paint is less than total browser test runtime." + ); +}); diff --git a/toolkit/components/startup/tests/browser/browser_bug511456.js b/toolkit/components/startup/tests/browser/browser_bug511456.js new file mode 100644 index 0000000000..c080a1596f --- /dev/null +++ b/toolkit/components/startup/tests/browser/browser_bug511456.js @@ -0,0 +1,58 @@ +/* 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/. */ + +"use strict"; + +const TEST_URL = + "http://example.com/browser/toolkit/components/startup/tests/browser/beforeunload.html"; + +SpecialPowers.pushPrefEnv({ + set: [["dom.require_user_interaction_for_beforeunload", false]], +}); + +function test() { + waitForExplicitFinish(); + ignoreAllUncaughtExceptions(); + + // Create foreground window + let win2 = window.openDialog( + location, + "", + "chrome,all,dialog=no", + "about:blank" + ); + win2.addEventListener( + "load", + function () { + // Create background test tab + let browser = BrowserTestUtils.addTab(gBrowser, TEST_URL).linkedBrowser; + + whenBrowserLoaded(browser, function () { + let seenDialog = false; + + // Cancel the prompt the first time. + waitForOnBeforeUnloadDialog(browser, (btnLeave, btnStay) => { + seenDialog = + Services.focus.activeWindow == window && + gBrowser.selectedBrowser == browser; + btnStay.click(); + }); + + Services.startup.quit(Ci.nsIAppStartup.eAttemptQuit); + ok(seenDialog, "Should have seen a prompt dialog"); + ok(!win2.closed, "Shouldn't have closed the additional window"); + win2.close(); + + // Leave the page the second time. + waitForOnBeforeUnloadDialog(browser, (btnLeave, btnStay) => { + btnLeave.click(); + }); + + gBrowser.removeTab(gBrowser.selectedTab); + executeSoon(finish); + }); + }, + { once: true } + ); +} diff --git a/toolkit/components/startup/tests/browser/browser_bug537449.js b/toolkit/components/startup/tests/browser/browser_bug537449.js new file mode 100644 index 0000000000..1b54117a7d --- /dev/null +++ b/toolkit/components/startup/tests/browser/browser_bug537449.js @@ -0,0 +1,58 @@ +/* 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/. */ + +"use strict"; + +SpecialPowers.pushPrefEnv({ + set: [["dom.require_user_interaction_for_beforeunload", false]], +}); + +const TEST_URL = + "http://example.com/browser/toolkit/components/startup/tests/browser/beforeunload.html"; + +function test() { + waitForExplicitFinish(); + + gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser, TEST_URL); + let browser = gBrowser.selectedBrowser; + + whenBrowserLoaded(browser, function () { + let seenDialog = false; + + // Cancel the prompt the first time. + waitForOnBeforeUnloadDialog(browser, (btnLeave, btnStay) => { + seenDialog = true; + btnStay.click(); + }); + + Services.startup.quit(Ci.nsIAppStartup.eAttemptQuit); + ok(seenDialog, "Should have seen a prompt dialog"); + ok(!window.closed, "Shouldn't have closed the window"); + + let win2 = window.openDialog( + location, + "", + "chrome,all,dialog=no", + "about:blank" + ); + Assert.notEqual(win2, null, "Should have been able to open a new window"); + win2.addEventListener( + "load", + () => { + executeSoon(() => { + win2.close(); + + // Leave the page the second time. + waitForOnBeforeUnloadDialog(browser, (btnLeave, btnStay) => { + btnLeave.click(); + }); + + gBrowser.removeTab(gBrowser.selectedTab); + finish(); + }); + }, + { once: true } + ); + }); +} diff --git a/toolkit/components/startup/tests/browser/browser_crash_detection.js b/toolkit/components/startup/tests/browser/browser_crash_detection.js new file mode 100644 index 0000000000..a53669452d --- /dev/null +++ b/toolkit/components/startup/tests/browser/browser_crash_detection.js @@ -0,0 +1,30 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ + */ +/* eslint-disable mozilla/no-arbitrary-setTimeout */ + +function test() { + function checkLastSuccess() { + let lastSuccess = Services.prefs.getIntPref("toolkit.startup.last_success"); + let si = Services.startup.getStartupInfo(); + is( + lastSuccess, + parseInt(si.main.getTime() / 1000, 10), + "Startup tracking pref should be set after a delay at the end of startup" + ); + finish(); + } + + if ( + Services.prefs.getPrefType("toolkit.startup.max_resumed_crashes") == + Services.prefs.PREF_INVALID + ) { + info("Skipping this test since startup crash detection is disabled"); + return; + } + + const startupCrashEndDelay = 35 * 1000; + waitForExplicitFinish(); + requestLongerTimeout(2); + setTimeout(checkLastSuccess, startupCrashEndDelay); +} diff --git a/toolkit/components/startup/tests/browser/head.js b/toolkit/components/startup/tests/browser/head.js new file mode 100644 index 0000000000..4ebc19f80e --- /dev/null +++ b/toolkit/components/startup/tests/browser/head.js @@ -0,0 +1,28 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +"use strict"; + +const { PromptTestUtils } = ChromeUtils.importESModule( + "resource://testing-common/PromptTestUtils.sys.mjs" +); + +function whenBrowserLoaded(browser, callback) { + return BrowserTestUtils.browserLoaded(browser).then(callback); +} + +function waitForOnBeforeUnloadDialog(browser, callback) { + PromptTestUtils.waitForPrompt(browser, { + modalType: Services.prompt.MODAL_TYPE_CONTENT, + promptType: "confirmEx", + }).then(dialog => { + SimpleTest.waitForCondition( + () => Services.focus.activeWindow == browser.ownerGlobal, + function () { + let { button0, button1 } = dialog.ui; + callback(button0, button1); + }, + "Waited too long for window with dialog to focus" + ); + }); +} diff --git a/toolkit/components/startup/tests/unit/head_startup.js b/toolkit/components/startup/tests/unit/head_startup.js new file mode 100644 index 0000000000..3db4a12d89 --- /dev/null +++ b/toolkit/components/startup/tests/unit/head_startup.js @@ -0,0 +1,39 @@ +/* Any copyright is dedicated to the Public Domain. + http://creativecommons.org/publicdomain/zero/1.0/ */ + +const XULRUNTIME_CONTRACTID = "@mozilla.org/xre/runtime;1"; +const XULRUNTIME_CID = Components.ID("7685dac8-3637-4660-a544-928c5ec0e714}"); + +var { XPCOMUtils } = ChromeUtils.importESModule( + "resource://gre/modules/XPCOMUtils.sys.mjs" +); + +var gAppInfo = null; + +function createAppInfo(ID, name, version, platformVersion = "1.0") { + let { newAppInfo } = ChromeUtils.importESModule( + "resource://testing-common/AppInfo.sys.mjs" + ); + gAppInfo = newAppInfo({ + ID, + name, + version, + platformVersion, + crashReporter: true, + replacedLockTime: 0, + }); + + let XULAppInfoFactory = { + createInstance(iid) { + return gAppInfo.QueryInterface(iid); + }, + }; + + let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar); + registrar.registerFactory( + XULRUNTIME_CID, + "XULRuntime", + XULRUNTIME_CONTRACTID, + XULAppInfoFactory + ); +} diff --git a/toolkit/components/startup/tests/unit/test_startup_crash.js b/toolkit/components/startup/tests/unit/test_startup_crash.js new file mode 100644 index 0000000000..7beb519a01 --- /dev/null +++ b/toolkit/components/startup/tests/unit/test_startup_crash.js @@ -0,0 +1,329 @@ +/* Any copyright is dedicated to the Public Domain. + http://creativecommons.org/publicdomain/zero/1.0/ */ + +createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "10.0"); + +var prefService = Services.prefs; +var appStartup = Services.startup; + +const pref_last_success = "toolkit.startup.last_success"; +const pref_recent_crashes = "toolkit.startup.recent_crashes"; +const pref_max_resumed_crashes = "toolkit.startup.max_resumed_crashes"; +const pref_always_use_safe_mode = "toolkit.startup.always_use_safe_mode"; + +function run_test() { + prefService.setBoolPref(pref_always_use_safe_mode, true); + + resetTestEnv(0); + + test_trackStartupCrashBegin(); + test_trackStartupCrashEnd(); + test_trackStartupCrashBegin_safeMode(); + test_trackStartupCrashEnd_safeMode(); + test_maxResumed(); + resetTestEnv(0); + + prefService.clearUserPref(pref_always_use_safe_mode); +} + +// reset prefs to default +function resetTestEnv(replacedLockTime) { + try { + // call begin to reset mStartupCrashTrackingEnded + appStartup.trackStartupCrashBegin(); + } catch (x) {} + prefService.setIntPref(pref_max_resumed_crashes, 2); + prefService.clearUserPref(pref_recent_crashes); + gAppInfo.replacedLockTime = replacedLockTime; + prefService.clearUserPref(pref_last_success); +} + +function now_seconds() { + return ms_to_s(Date.now()); +} + +function ms_to_s(ms) { + return Math.floor(ms / 1000); +} + +function test_trackStartupCrashBegin() { + let max_resumed = prefService.getIntPref(pref_max_resumed_crashes); + Assert.ok(!gAppInfo.inSafeMode); + + // first run with startup crash tracking - existing profile lock + let replacedLockTime = Date.now(); + resetTestEnv(replacedLockTime); + Assert.ok(!prefService.prefHasUserValue(pref_recent_crashes)); + Assert.ok(!prefService.prefHasUserValue(pref_last_success)); + Assert.equal(replacedLockTime, gAppInfo.replacedLockTime); + try { + Assert.ok(!appStartup.trackStartupCrashBegin()); + do_throw("Should have thrown since last_success is not set"); + } catch (x) {} + + Assert.ok(!prefService.prefHasUserValue(pref_last_success)); + Assert.ok(!prefService.prefHasUserValue(pref_recent_crashes)); + Assert.ok(!appStartup.automaticSafeModeNecessary); + + // first run with startup crash tracking - no existing profile lock + replacedLockTime = 0; + resetTestEnv(replacedLockTime); + Assert.ok(!prefService.prefHasUserValue(pref_recent_crashes)); + Assert.ok(!prefService.prefHasUserValue(pref_last_success)); + Assert.equal(replacedLockTime, gAppInfo.replacedLockTime); + try { + Assert.ok(!appStartup.trackStartupCrashBegin()); + do_throw("Should have thrown since last_success is not set"); + } catch (x) {} + + Assert.ok(!prefService.prefHasUserValue(pref_last_success)); + Assert.ok(!prefService.prefHasUserValue(pref_recent_crashes)); + Assert.ok(!appStartup.automaticSafeModeNecessary); + + // normal startup - last startup was success + replacedLockTime = Date.now(); + resetTestEnv(replacedLockTime); + Assert.ok(!prefService.prefHasUserValue(pref_recent_crashes)); + prefService.setIntPref(pref_last_success, ms_to_s(replacedLockTime)); + Assert.equal( + ms_to_s(replacedLockTime), + prefService.getIntPref(pref_last_success) + ); + Assert.ok(!appStartup.trackStartupCrashBegin()); + Assert.equal( + ms_to_s(replacedLockTime), + prefService.getIntPref(pref_last_success) + ); + Assert.ok(!prefService.prefHasUserValue(pref_recent_crashes)); + Assert.ok(!appStartup.automaticSafeModeNecessary); + + // normal startup with 1 recent crash + resetTestEnv(replacedLockTime); + prefService.setIntPref(pref_recent_crashes, 1); + prefService.setIntPref(pref_last_success, ms_to_s(replacedLockTime)); + Assert.ok(!appStartup.trackStartupCrashBegin()); + Assert.equal( + ms_to_s(replacedLockTime), + prefService.getIntPref(pref_last_success) + ); + Assert.equal(1, prefService.getIntPref(pref_recent_crashes)); + Assert.ok(!appStartup.automaticSafeModeNecessary); + + // normal startup with max_resumed_crashes crash + resetTestEnv(replacedLockTime); + prefService.setIntPref(pref_recent_crashes, max_resumed); + prefService.setIntPref(pref_last_success, ms_to_s(replacedLockTime)); + Assert.ok(!appStartup.trackStartupCrashBegin()); + Assert.equal( + ms_to_s(replacedLockTime), + prefService.getIntPref(pref_last_success) + ); + Assert.equal(max_resumed, prefService.getIntPref(pref_recent_crashes)); + Assert.ok(!appStartup.automaticSafeModeNecessary); + + // normal startup with too many recent crashes + resetTestEnv(replacedLockTime); + prefService.setIntPref(pref_recent_crashes, max_resumed + 1); + prefService.setIntPref(pref_last_success, ms_to_s(replacedLockTime)); + Assert.ok(appStartup.trackStartupCrashBegin()); + // should remain the same since the last startup was not a crash + Assert.equal(max_resumed + 1, prefService.getIntPref(pref_recent_crashes)); + Assert.ok(appStartup.automaticSafeModeNecessary); + + // normal startup with too many recent crashes and startup crash tracking disabled + resetTestEnv(replacedLockTime); + prefService.setIntPref(pref_max_resumed_crashes, -1); + prefService.setIntPref(pref_recent_crashes, max_resumed + 1); + prefService.setIntPref(pref_last_success, ms_to_s(replacedLockTime)); + Assert.ok(!appStartup.trackStartupCrashBegin()); + // should remain the same since the last startup was not a crash + Assert.equal(max_resumed + 1, prefService.getIntPref(pref_recent_crashes)); + // returns false when disabled + Assert.ok(!appStartup.automaticSafeModeNecessary); + Assert.equal(-1, prefService.getIntPref(pref_max_resumed_crashes)); + + // normal startup after 1 non-recent crash (1 year ago), no other recent + replacedLockTime = Date.now() - 365 * 24 * 60 * 60 * 1000; + resetTestEnv(replacedLockTime); + prefService.setIntPref( + pref_last_success, + ms_to_s(replacedLockTime) - 365 * 24 * 60 * 60 + ); + Assert.ok(!appStartup.trackStartupCrashBegin()); + // recent crash count pref should be unset since the last crash was not recent + Assert.ok(!prefService.prefHasUserValue(pref_recent_crashes)); + Assert.ok(!appStartup.automaticSafeModeNecessary); + + // normal startup after 1 crash (1 minute ago), no other recent + replacedLockTime = Date.now() - 60 * 1000; + resetTestEnv(replacedLockTime); + prefService.setIntPref( + pref_last_success, + ms_to_s(replacedLockTime) - 60 * 60 + ); // last success - 1 hour ago + Assert.ok(!appStartup.trackStartupCrashBegin()); + // recent crash count pref should be created with value 1 + Assert.equal(1, prefService.getIntPref(pref_recent_crashes)); + Assert.ok(!appStartup.automaticSafeModeNecessary); + + // normal startup after another crash (1 minute ago), 1 already + prefService.setIntPref( + pref_last_success, + ms_to_s(replacedLockTime) - 60 * 60 + ); // last success - 1 hour ago + replacedLockTime = Date.now() - 60 * 1000; + gAppInfo.replacedLockTime = replacedLockTime; + Assert.ok(!appStartup.trackStartupCrashBegin()); + // recent crash count pref should be incremented by 1 + Assert.equal(2, prefService.getIntPref(pref_recent_crashes)); + Assert.ok(!appStartup.automaticSafeModeNecessary); + + // normal startup after another crash (1 minute ago), 2 already + prefService.setIntPref( + pref_last_success, + ms_to_s(replacedLockTime) - 60 * 60 + ); // last success - 1 hour ago + Assert.ok(appStartup.trackStartupCrashBegin()); + // recent crash count pref should be incremented by 1 + Assert.equal(3, prefService.getIntPref(pref_recent_crashes)); + Assert.ok(appStartup.automaticSafeModeNecessary); + + // normal startup after 1 non-recent crash (1 year ago), 3 crashes already + replacedLockTime = Date.now() - 365 * 24 * 60 * 60 * 1000; + resetTestEnv(replacedLockTime); + prefService.setIntPref( + pref_last_success, + ms_to_s(replacedLockTime) - 60 * 60 + ); // last success - 1 hour ago + Assert.ok(!appStartup.trackStartupCrashBegin()); + // recent crash count should be unset since the last crash was not recent + Assert.ok(!prefService.prefHasUserValue(pref_recent_crashes)); + Assert.ok(!appStartup.automaticSafeModeNecessary); +} + +function test_trackStartupCrashEnd() { + // successful startup with no last_success (upgrade test) + let replacedLockTime = Date.now() - 10 * 1000; // 10s ago + resetTestEnv(replacedLockTime); + try { + appStartup.trackStartupCrashBegin(); // required to be called before end + do_throw("Should have thrown since last_success is not set"); + } catch (x) {} + appStartup.trackStartupCrashEnd(); + Assert.ok(!prefService.prefHasUserValue(pref_recent_crashes)); + Assert.ok(!prefService.prefHasUserValue(pref_last_success)); + + // successful startup - should set last_success + replacedLockTime = Date.now() - 10 * 1000; // 10s ago + resetTestEnv(replacedLockTime); + prefService.setIntPref(pref_last_success, ms_to_s(replacedLockTime)); + appStartup.trackStartupCrashBegin(); // required to be called before end + appStartup.trackStartupCrashEnd(); + // ensure last_success was set since we have declared a succesful startup + // main timestamp doesn't get set in XPCShell so approximate with now + Assert.ok(prefService.getIntPref(pref_last_success) <= now_seconds()); + Assert.ok( + prefService.getIntPref(pref_last_success) >= now_seconds() - 4 * 60 * 60 + ); + Assert.ok(!prefService.prefHasUserValue(pref_recent_crashes)); + + // successful startup with 1 recent crash + resetTestEnv(replacedLockTime); + prefService.setIntPref(pref_last_success, ms_to_s(replacedLockTime)); + prefService.setIntPref(pref_recent_crashes, 1); + appStartup.trackStartupCrashBegin(); // required to be called before end + appStartup.trackStartupCrashEnd(); + // ensure recent_crashes was cleared since we have declared a succesful startup + Assert.ok(!prefService.prefHasUserValue(pref_recent_crashes)); +} + +function test_trackStartupCrashBegin_safeMode() { + gAppInfo.inSafeMode = true; + resetTestEnv(0); + let max_resumed = prefService.getIntPref(pref_max_resumed_crashes); + + // check manual safe mode doesn't change prefs without crash + let replacedLockTime = Date.now() - 10 * 1000; // 10s ago + resetTestEnv(replacedLockTime); + prefService.setIntPref(pref_last_success, ms_to_s(replacedLockTime)); + + Assert.ok(!prefService.prefHasUserValue(pref_recent_crashes)); + Assert.ok(prefService.prefHasUserValue(pref_last_success)); + Assert.ok(!appStartup.automaticSafeModeNecessary); + Assert.ok(!appStartup.trackStartupCrashBegin()); + Assert.ok(!prefService.prefHasUserValue(pref_recent_crashes)); + Assert.ok(prefService.prefHasUserValue(pref_last_success)); + Assert.ok(!appStartup.automaticSafeModeNecessary); + + // check forced safe mode doesn't change prefs without crash + replacedLockTime = Date.now() - 10 * 1000; // 10s ago + resetTestEnv(replacedLockTime); + prefService.setIntPref(pref_last_success, ms_to_s(replacedLockTime)); + prefService.setIntPref(pref_recent_crashes, max_resumed + 1); + + Assert.equal(max_resumed + 1, prefService.getIntPref(pref_recent_crashes)); + Assert.ok(prefService.prefHasUserValue(pref_last_success)); + Assert.ok(!appStartup.automaticSafeModeNecessary); + Assert.ok(appStartup.trackStartupCrashBegin()); + Assert.equal(max_resumed + 1, prefService.getIntPref(pref_recent_crashes)); + Assert.ok(prefService.prefHasUserValue(pref_last_success)); + Assert.ok(appStartup.automaticSafeModeNecessary); + + // check forced safe mode after old crash + replacedLockTime = Date.now() - 365 * 24 * 60 * 60 * 1000; + resetTestEnv(replacedLockTime); + // one year ago + let last_success = ms_to_s(replacedLockTime) - 365 * 24 * 60 * 60; + prefService.setIntPref(pref_last_success, last_success); + prefService.setIntPref(pref_recent_crashes, max_resumed + 1); + Assert.equal(max_resumed + 1, prefService.getIntPref(pref_recent_crashes)); + Assert.ok(prefService.prefHasUserValue(pref_last_success)); + Assert.ok(appStartup.automaticSafeModeNecessary); + Assert.ok(appStartup.trackStartupCrashBegin()); + Assert.equal(max_resumed + 1, prefService.getIntPref(pref_recent_crashes)); + Assert.equal(last_success, prefService.getIntPref(pref_last_success)); + Assert.ok(appStartup.automaticSafeModeNecessary); +} + +function test_trackStartupCrashEnd_safeMode() { + gAppInfo.inSafeMode = true; + let replacedLockTime = Date.now(); + resetTestEnv(replacedLockTime); + let max_resumed = prefService.getIntPref(pref_max_resumed_crashes); + prefService.setIntPref( + pref_last_success, + ms_to_s(replacedLockTime) - 24 * 60 * 60 + ); + + // ensure recent_crashes were not cleared in manual safe mode + prefService.setIntPref(pref_recent_crashes, 1); + appStartup.trackStartupCrashBegin(); // required to be called before end + appStartup.trackStartupCrashEnd(); + Assert.equal(1, prefService.getIntPref(pref_recent_crashes)); + + // recent_crashes should be set to max_resumed in forced safe mode to allow the user + // to try and start in regular mode after making changes. + prefService.setIntPref(pref_recent_crashes, max_resumed + 1); + appStartup.trackStartupCrashBegin(); // required to be called before end + appStartup.trackStartupCrashEnd(); + Assert.equal(max_resumed, prefService.getIntPref(pref_recent_crashes)); +} + +function test_maxResumed() { + resetTestEnv(0); + gAppInfo.inSafeMode = false; + let max_resumed = prefService.getIntPref(pref_max_resumed_crashes); + let replacedLockTime = Date.now(); + resetTestEnv(replacedLockTime); + prefService.setIntPref(pref_max_resumed_crashes, -1); + + prefService.setIntPref(pref_recent_crashes, max_resumed + 1); + prefService.setIntPref( + pref_last_success, + ms_to_s(replacedLockTime) - 24 * 60 * 60 + ); + appStartup.trackStartupCrashBegin(); + // should remain the same since the last startup was not a crash + Assert.equal(max_resumed + 2, prefService.getIntPref(pref_recent_crashes)); + Assert.ok(!appStartup.automaticSafeModeNecessary); +} diff --git a/toolkit/components/startup/tests/unit/xpcshell.toml b/toolkit/components/startup/tests/unit/xpcshell.toml new file mode 100644 index 0000000000..b69c5e56d3 --- /dev/null +++ b/toolkit/components/startup/tests/unit/xpcshell.toml @@ -0,0 +1,5 @@ +[DEFAULT] +head = "head_startup.js" +skip-if = ["os == 'android'"] + +["test_startup_crash.js"] -- cgit v1.2.3