diff --git a/browser/base/content/test/tabcrashed/browser_aboutRestartRequired.toml b/browser/base/content/test/tabcrashed/browser_aboutRestartRequired.toml index 8f8648d81074..d0d3ede5a265 100644 --- a/browser/base/content/test/tabcrashed/browser_aboutRestartRequired.toml +++ b/browser/base/content/test/tabcrashed/browser_aboutRestartRequired.toml @@ -9,15 +9,3 @@ prefs = [ ] ["browser_aboutRestartRequired_basic.js"] - -# Bug 1876056: re-enable once bug 1877361 is fixed -#["browser_aboutRestartRequired_buildid_false-positive.js"] -#skip-if = ["win11_2009 && msix && debug"] # bug 1823581 - -# Bug 1888355: re-enable once bug 1877361 is fixed -#["browser_aboutRestartRequired_buildid_mismatch.js"] -#skip-if = ["win11_2009 && msix && debug"] # bug 1823581 - -# Bug 1888355: re-enable once bug 1877361 is fixed -#["browser_aboutRestartRequired_buildid_no-platform-ini.js"] -#skip-if = ["win11_2009 && msix && debug"] # bug 1823581 diff --git a/browser/base/content/test/tabcrashed/browser_aboutRestartRequired_buildid_false-positive.js b/browser/base/content/test/tabcrashed/browser_aboutRestartRequired_buildid_false-positive.js index 15e0b5ab312f..4321700a7aa4 100644 --- a/browser/base/content/test/tabcrashed/browser_aboutRestartRequired_buildid_false-positive.js +++ b/browser/base/content/test/tabcrashed/browser_aboutRestartRequired_buildid_false-positive.js @@ -17,7 +17,6 @@ add_task(async function test_browser_crashed_false_positive_event() { "Build ID mismatch false positive count should be undefined" ); - ok(await ensureBuildID(), "System has correct platform.ini"); setBuildidMatchDontSendEnv(); await forceCleanProcesses(); let eventPromise = getEventPromise("oop-browser-crashed", "false-positive"); diff --git a/browser/base/content/test/tabcrashed/browser_aboutRestartRequired_buildid_mismatch.js b/browser/base/content/test/tabcrashed/browser_aboutRestartRequired_buildid_mismatch.js deleted file mode 100644 index 80f35db159f6..000000000000 --- a/browser/base/content/test/tabcrashed/browser_aboutRestartRequired_buildid_mismatch.js +++ /dev/null @@ -1,56 +0,0 @@ -"use strict"; - -// On debug builds, crashing tabs results in much thinking, which -// slows down the test and results in intermittent test timeouts, -// so we'll pump up the expected timeout for this test. -requestLongerTimeout(2); - -SimpleTest.expectChildProcessCrash(); - -add_task(async function test_browser_restartrequired_event() { - info("Waiting for oop-browser-buildid-mismatch event."); - - Services.telemetry.clearScalars(); - is( - getFalsePositiveTelemetry(), - undefined, - "Build ID mismatch false positive count should be undefined" - ); - - ok(await ensureBuildID(), "System has correct platform.ini"); - - let profD = Services.dirsvc.get("GreD", Ci.nsIFile); - let platformIniOrig = await IOUtils.readUTF8( - PathUtils.join(profD.path, "platform.ini") - ); - let buildID = Services.appinfo.platformBuildID; - let platformIniNew = platformIniOrig.replace(buildID, "1234"); - - await IOUtils.writeUTF8( - PathUtils.join(profD.path, "platform.ini"), - platformIniNew, - { flush: true } - ); - - setBuildidMatchDontSendEnv(); - await forceCleanProcesses(); - let eventPromise = getEventPromise( - "oop-browser-buildid-mismatch", - "buildid-mismatch" - ); - let tab = await openNewTab(false); - await eventPromise; - await IOUtils.writeUTF8( - PathUtils.join(profD.path, "platform.ini"), - platformIniOrig, - { flush: true } - ); - unsetBuildidMatchDontSendEnv(); - - is( - getFalsePositiveTelemetry(), - undefined, - "Build ID mismatch false positive count should be undefined" - ); - await closeTab(tab); -}); diff --git a/browser/base/content/test/tabcrashed/browser_aboutRestartRequired_buildid_no-platform-ini.js b/browser/base/content/test/tabcrashed/browser_aboutRestartRequired_buildid_no-platform-ini.js deleted file mode 100644 index 232c79b02e83..000000000000 --- a/browser/base/content/test/tabcrashed/browser_aboutRestartRequired_buildid_no-platform-ini.js +++ /dev/null @@ -1,50 +0,0 @@ -"use strict"; - -// On debug builds, crashing tabs results in much thinking, which -// slows down the test and results in intermittent test timeouts, -// so we'll pump up the expected timeout for this test. -requestLongerTimeout(2); - -SimpleTest.expectChildProcessCrash(); - -add_task(async function test_browser_crashed_no_platform_ini_event() { - info("Waiting for oop-browser-buildid-mismatch event."); - - Services.telemetry.clearScalars(); - is( - getFalsePositiveTelemetry(), - undefined, - "Build ID mismatch false positive count should be undefined" - ); - - ok(await ensureBuildID(), "System has correct platform.ini"); - - let profD = Services.dirsvc.get("GreD", Ci.nsIFile); - let platformIniOrig = await IOUtils.readUTF8( - PathUtils.join(profD.path, "platform.ini") - ); - - await IOUtils.remove(PathUtils.join(profD.path, "platform.ini")); - - setBuildidMatchDontSendEnv(); - await forceCleanProcesses(); - let eventPromise = getEventPromise( - "oop-browser-buildid-mismatch", - "no-platform-ini" - ); - let tab = await openNewTab(false); - await eventPromise; - await IOUtils.writeUTF8( - PathUtils.join(profD.path, "platform.ini"), - platformIniOrig, - { flush: true } - ); - unsetBuildidMatchDontSendEnv(); - - is( - getFalsePositiveTelemetry(), - undefined, - "Build ID mismatch false positive count should be undefined" - ); - await closeTab(tab); -}); diff --git a/browser/base/content/test/tabcrashed/browser_aboutRestartRequired_noForkServer.toml b/browser/base/content/test/tabcrashed/browser_aboutRestartRequired_noForkServer.toml index ddb49a0e2631..fff10d050aa6 100644 --- a/browser/base/content/test/tabcrashed/browser_aboutRestartRequired_noForkServer.toml +++ b/browser/base/content/test/tabcrashed/browser_aboutRestartRequired_noForkServer.toml @@ -10,13 +10,6 @@ prefs = [ ] # Bug 1876056: remove once bug 1877361 is fixed + ["browser_aboutRestartRequired_buildid_false-positive.js"] skip-if = ["win11_2009 && msix && debug"] # bug 1823581 - -# Bug 1888355: re-enable once bug 1877361 is fixed -["browser_aboutRestartRequired_buildid_mismatch.js"] -skip-if = ["win11_2009 && msix && debug"] # bug 1823581 - -# Bug 1888355: re-enable once bug 1877361 is fixed -["browser_aboutRestartRequired_buildid_no-platform-ini.js"] -skip-if = ["win11_2009 && msix && debug"] # bug 1823581 diff --git a/browser/base/content/test/tabcrashed/head.js b/browser/base/content/test/tabcrashed/head.js index b4e913701221..d79697a2a009 100644 --- a/browser/base/content/test/tabcrashed/head.js +++ b/browser/base/content/test/tabcrashed/head.js @@ -171,15 +171,6 @@ function getEventPromise(eventName, eventKind) { }); } -async function ensureBuildID() { - let profD = Services.dirsvc.get("GreD", Ci.nsIFile); - let platformIniOrig = await IOUtils.readUTF8( - PathUtils.join(profD.path, "platform.ini") - ); - let buildID = Services.appinfo.platformBuildID; - return platformIniOrig.indexOf(buildID) > 0; -} - async function openNewTab(forceCrash) { const PAGE = "data:text/html,A%20regular,%20everyday,%20normal%20page.";