Commit 057f862d authored by Tamas Szentpeteri's avatar Tamas Szentpeteri
Browse files

Backed out 7 changesets (bug 1876590) as requested by Gerard for causing gtest... 

Backed out 7 changesets (bug 1876590) as requested by Gerard for causing gtest failures related to BuildIDReader.ReadFromRealLib. CLOSED TREE

Backed out changeset 9ac3a93622c8 (bug 1876590)
Backed out changeset 2cd2cc626c44 (bug 1876590)
Backed out changeset 6d978847d7dd (bug 1876590)
Backed out changeset 0b07a6f1beac (bug 1876590)
Backed out changeset 55cc3acc9297 (bug 1876590)
Backed out changeset 115753252616 (bug 1876590)
Backed out changeset c75ebb5f3a80 (bug 1876590)
parent e08a3425

Cargo.lock

+5 −18
Original line number Diff line number Diff line
@@ -574,18 +574,6 @@ dependencies = [ 
 "num_cpus",

]



[[package]]

name = "buildid_reader"

version = "0.1.0"

dependencies = [

 "goblin 0.8.1",

 "libc",

 "log",

 "nserror",

 "nsstring",

 "scroll",

]



[[package]]

name = "builtins-static"

version = "0.1.0"
@@ -2267,7 +2255,6 @@ dependencies = [ 
 "binary_http",

 "bitsdownload",

 "bookmark_sync",

 "buildid_reader",

 "cascade_bloom_filter",

 "cert_storage",

 "chardetng_c",
@@ -2466,14 +2453,14 @@ dependencies = [ 
name = "goblin"

version = "0.7.999"

dependencies = [

 "goblin 0.8.1",

 "goblin 0.8.0",

]



[[package]]

name = "goblin"

version = "0.8.1"

version = "0.8.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8ce2dfb858618fd40cafc83efadd02705adf6ffba765098736bd950c3c945fe0"

checksum = "bb07a4ffed2093b118a525b1d8f5204ae274faed5604537caf7135d0f18d9887"

dependencies = [

 "log",

 "plain",
@@ -3655,7 +3642,7 @@ dependencies = [ 
 "byteorder",

 "cfg-if",

 "crash-context",

 "goblin 0.8.1",

 "goblin 0.8.0",

 "libc",

 "log",

 "mach2",
@@ -6182,7 +6169,7 @@ dependencies = [ 
 "cargo_metadata",

 "fs-err",

 "glob",

 "goblin 0.8.1",

 "goblin 0.8.0",

 "heck",

 "once_cell",

 "paste",

browser/base/content/test/tabcrashed/browser_aboutRestartRequired.toml

+12 −0
Original line number Diff line number Diff line
@@ -9,3 +9,15 @@ 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

browser/base/content/test/tabcrashed/browser_aboutRestartRequired_buildid_false-positive.js

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 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");

browser/base/content/test/tabcrashed/browser_aboutRestartRequired_buildid_mismatch.js

0 → 100644
+56 −0
Original line number Diff line number Diff line 
"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);

});

browser/base/content/test/tabcrashed/browser_aboutRestartRequired_buildid_no-platform-ini.js

0 → 100644
+50 −0
Original line number Diff line number Diff line 
"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);

});