mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1872290 - Enable browser.search.log in all browser search telemetry tests - r=scunnane 

Differential Revision: https://phabricator.services.mozilla.com/D197388
This commit is contained in:
James Teow 2023-12-28 23:02:18 +00:00
Родитель 2540cc093a
Коммит 315aa45091
32 изменённых файлов: 18 добавлений и 105 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
browser/components/search/test/browser/telemetry/browser.toml
Просмотреть файл

@ -1,6 +1,7 @@
[DEFAULT]
tags = "search-telemetry"
support-files = ["head.js"]
prefs = ["browser.search.log=true"]
["browser_search_glean_serp_event_telemetry_categorization_enabled_by_nimbus_variable.js"]
support-files = [

4
browser/components/search/test/browser/telemetry/browser_search_glean_serp_event_telemetry_categorization_enabled_by_nimbus_variable.js
Просмотреть файл

@ -83,10 +83,6 @@ add_setup(async function () {
let oldCanRecord = Services.telemetry.canRecordExtended;
Services.telemetry.canRecordExtended = true;
await SpecialPowers.pushPrefEnv({
set: [["browser.search.log", true]],
});
// Clear existing Remote Settings data.
await db.clear();
info("Create record with attachment.");

4
browser/components/search/test/browser/telemetry/browser_search_glean_serp_event_telemetry_enabled_by_nimbus_variable.js
Просмотреть файл

@ -106,10 +106,6 @@ add_setup(async function () {
let oldCanRecord = Services.telemetry.canRecordExtended;
Services.telemetry.canRecordExtended = true;
await SpecialPowers.pushPrefEnv({
set: [["browser.search.log", true]],
});
registerCleanupFunction(async () => {
SearchSERPTelemetry.overrideSearchTelemetryForTests();
Services.telemetry.canRecordExtended = oldCanRecord;

5
browser/components/search/test/browser/telemetry/browser_search_telemetry_abandonment.js
Просмотреть файл

@ -33,10 +33,7 @@ add_setup(async function () {
let oldCanRecord = Services.telemetry.canRecordExtended;
Services.telemetry.canRecordExtended = true;
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.log", true],
["browser.search.serpEventTelemetry.enabled", true],
],
set: [["browser.search.serpEventTelemetry.enabled", true]],
});
registerCleanupFunction(async () => {

5
browser/components/search/test/browser/telemetry/browser_search_telemetry_adImpression_component.js
Просмотреть файл

@ -95,10 +95,7 @@ add_setup(async function () {
let oldCanRecord = Services.telemetry.canRecordExtended;
Services.telemetry.canRecordExtended = true;
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.log", true],
["browser.search.serpEventTelemetry.enabled", true],
],
set: [["browser.search.serpEventTelemetry.enabled", true]],
});
// The tests evaluate whether or not ads are visible depending on whether

5
browser/components/search/test/browser/telemetry/browser_search_telemetry_categorization_timing.js
Просмотреть файл

@ -31,10 +31,7 @@ add_setup(async function () {
SearchSERPTelemetry.overrideSearchTelemetryForTests(TEST_PROVIDER_INFO);
await waitForIdle();
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.log", true],
["browser.search.serpEventTelemetry.enabled", true],
],
set: [["browser.search.serpEventTelemetry.enabled", true]],
});
registerCleanupFunction(async () => {

4
browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_ad_values.js
Просмотреть файл

@ -69,10 +69,6 @@ add_setup(async function () {
SearchSERPTelemetry.overrideSearchTelemetryForTests(TEST_PROVIDER_INFO);
await waitForIdle();
await SpecialPowers.pushPrefEnv({
set: [["browser.search.log", true]],
});
await db.clear();
let { record, attachment } = await mockRecordWithAttachment({
id: "example_id",

4
browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_download_timer.js
Просмотреть файл

@ -83,10 +83,6 @@ add_setup(async function () {
SearchSERPTelemetry.overrideSearchTelemetryForTests(TEST_PROVIDER_INFO);
await waitForIdle();
await SpecialPowers.pushPrefEnv({
set: [["browser.search.log", true]],
});
let defaultDownloadSettings = {
...TELEMETRY_CATEGORIZATION_DOWNLOAD_SETTINGS,
};

1
browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_extraction.js
Просмотреть файл

@ -169,7 +169,6 @@ const TESTS = [
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.log", true],
["browser.search.serpEventTelemetry.enabled", true],
["browser.search.serpEventTelemetryCategorization.enabled", true],
],

4
browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_locale_and_region.js
Просмотреть файл

@ -75,10 +75,6 @@ add_setup(async function () {
SearchSERPTelemetry.overrideSearchTelemetryForTests(TEST_PROVIDER_INFO);
await waitForIdle();
await SpecialPowers.pushPrefEnv({
set: [["browser.search.log", true]],
});
await db.clear();
let { record, attachment } = await mockRecordWithAttachment({
id: "example_id",

4
browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_reporting.js
Просмотреть файл

@ -69,10 +69,6 @@ add_setup(async function () {
SearchSERPTelemetry.overrideSearchTelemetryForTests(TEST_PROVIDER_INFO);
await waitForIdle();
await SpecialPowers.pushPrefEnv({
set: [["browser.search.log", true]],
});
registerCleanupFunction(async () => {
SearchSERPTelemetry.overrideSearchTelemetryForTests();
resetTelemetry();

5
browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_cached.js
Просмотреть файл

@ -90,10 +90,7 @@ add_setup(async function () {
let oldCanRecord = Services.telemetry.canRecordExtended;
Services.telemetry.canRecordExtended = true;
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.log", true],
["browser.search.serpEventTelemetry.enabled", true],
],
set: [["browser.search.serpEventTelemetry.enabled", true]],
});
registerCleanupFunction(async () => {

5
browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_cached_serp.js
Просмотреть файл

@ -49,10 +49,7 @@ add_setup(async function () {
SearchSERPTelemetry.overrideSearchTelemetryForTests(TEST_PROVIDER_INFO);
await waitForIdle();
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.log", true],
["browser.search.serpEventTelemetry.enabled", true],
],
set: [["browser.search.serpEventTelemetry.enabled", true]],
});
registerCleanupFunction(async () => {

5
browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_content.js
Просмотреть файл

@ -76,10 +76,7 @@ add_setup(async function () {
let oldCanRecord = Services.telemetry.canRecordExtended;
Services.telemetry.canRecordExtended = true;
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.log", true],
["browser.search.serpEventTelemetry.enabled", true],
],
set: [["browser.search.serpEventTelemetry.enabled", true]],
});
registerCleanupFunction(async () => {

1
browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_multiple_tabs.js
Просмотреть файл

@ -64,7 +64,6 @@ add_setup(async function () {
await waitForIdle();
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.log", true],
["browser.search.serpEventTelemetry.enabled", true],
["dom.ipc.processCount.webIsolated", MAX_IPC],
],

5
browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_non_ad.js
Просмотреть файл

@ -33,10 +33,7 @@ add_setup(async function () {
await waitForIdle();
// Enable local telemetry recording for the duration of the tests.
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.log", true],
["browser.search.serpEventTelemetry.enabled", true],
],
set: [["browser.search.serpEventTelemetry.enabled", true]],
});
registerCleanupFunction(async () => {

5
browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_query_params.js
Просмотреть файл

@ -51,10 +51,7 @@ add_setup(async function () {
let oldCanRecord = Services.telemetry.canRecordExtended;
Services.telemetry.canRecordExtended = true;
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.log", true],
["browser.search.serpEventTelemetry.enabled", true],
],
set: [["browser.search.serpEventTelemetry.enabled", true]],
});
registerCleanupFunction(async () => {

5
browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_redirect.js
Просмотреть файл

@ -38,10 +38,7 @@ add_setup(async function () {
await waitForIdle();
// Enable local telemetry recording for the duration of the tests.
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.log", true],
["browser.search.serpEventTelemetry.enabled", true],
],
set: [["browser.search.serpEventTelemetry.enabled", true]],
});
registerCleanupFunction(async () => {

5
browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_target.js
Просмотреть файл

@ -110,10 +110,7 @@ add_setup(async function () {
let oldCanRecord = Services.telemetry.canRecordExtended;
Services.telemetry.canRecordExtended = true;
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.log", true],
["browser.search.serpEventTelemetry.enabled", true],
],
set: [["browser.search.serpEventTelemetry.enabled", true]],
});
registerCleanupFunction(async () => {

5
browser/components/search/test/browser/telemetry/browser_search_telemetry_new_window.js
Просмотреть файл

@ -32,10 +32,7 @@ add_setup(async function () {
await waitForIdle();
// Enable local telemetry recording for the duration of the tests.
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.log", true],
["browser.search.serpEventTelemetry.enabled", true],
],
set: [["browser.search.serpEventTelemetry.enabled", true]],
});
registerCleanupFunction(async () => {

5
browser/components/search/test/browser/telemetry/browser_search_telemetry_private.js
Просмотреть файл

@ -33,10 +33,7 @@ add_setup(async function () {
await waitForIdle();
// Enable local telemetry recording for the duration of the tests.
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.log", true],
["browser.search.serpEventTelemetry.enabled", true],
],
set: [["browser.search.serpEventTelemetry.enabled", true]],
});
registerCleanupFunction(async () => {

1
browser/components/search/test/browser/telemetry/browser_search_telemetry_remote_settings_sync.js
Просмотреть файл

@ -86,7 +86,6 @@ add_setup(async function () {
// Enable local telemetry recording for the duration of the tests.
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.log", true],
["browser.search.serpEventTelemetry.enabled", true],
// Set the IPC count to a small number so that we only have to open
// one additional tab to reuse the same process.

5
browser/components/search/test/browser/telemetry/browser_search_telemetry_shopping.js
Просмотреть файл

@ -56,10 +56,7 @@ add_setup(async function () {
let oldCanRecord = Services.telemetry.canRecordExtended;
Services.telemetry.canRecordExtended = true;
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.log", true],
["browser.search.serpEventTelemetry.enabled", true],
],
set: [["browser.search.serpEventTelemetry.enabled", true]],
});
registerCleanupFunction(async () => {

2
browser/components/search/test/browser/telemetry/browser_search_telemetry_sources.js
Просмотреть файл

@ -69,7 +69,6 @@ add_setup(async function () {
// Enable local telemetry recording for the duration of the tests.
let oldCanRecord = Services.telemetry.canRecordExtended;
Services.telemetry.canRecordExtended = true;
Services.prefs.setBoolPref("browser.search.log", true);
await SearchTestUtils.installSearchExtension(
{
@ -86,7 +85,6 @@ add_setup(async function () {
registerCleanupFunction(async () => {
gCUITestUtils.removeSearchBar();
Services.prefs.clearUserPref("browser.search.log");
SearchSERPTelemetry.overrideSearchTelemetryForTests();
Services.telemetry.canRecordExtended = oldCanRecord;
resetTelemetry();

2
browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_about.js
Просмотреть файл

@ -67,7 +67,6 @@ add_setup(async function () {
// Enable local telemetry recording for the duration of the tests.
let oldCanRecord = Services.telemetry.canRecordExtended;
Services.telemetry.canRecordExtended = true;
Services.prefs.setBoolPref("browser.search.log", true);
await SearchTestUtils.installSearchExtension(
{
@ -84,7 +83,6 @@ add_setup(async function () {
registerCleanupFunction(async () => {
gCUITestUtils.removeSearchBar();
Services.prefs.clearUserPref("browser.search.log");
SearchSERPTelemetry.overrideSearchTelemetryForTests();
Services.telemetry.canRecordExtended = oldCanRecord;
resetTelemetry();

5
browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_ads.js
Просмотреть файл

@ -39,10 +39,7 @@ add_setup(async function () {
let oldCanRecord = Services.telemetry.canRecordExtended;
Services.telemetry.canRecordExtended = true;
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.log", true],
["browser.search.serpEventTelemetry.enabled", true],
],
set: [["browser.search.serpEventTelemetry.enabled", true]],
});
registerCleanupFunction(async () => {

5
browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_ads_clicks.js
Просмотреть файл

@ -35,10 +35,7 @@ add_setup(async function () {
let oldCanRecord = Services.telemetry.canRecordExtended;
Services.telemetry.canRecordExtended = true;
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.log", true],
["browser.search.serpEventTelemetry.enabled", true],
],
set: [["browser.search.serpEventTelemetry.enabled", true]],
});
registerCleanupFunction(async () => {

5
browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_ads_data_attributes.js
Просмотреть файл

@ -35,10 +35,7 @@ add_setup(async function () {
let oldCanRecord = Services.telemetry.canRecordExtended;
Services.telemetry.canRecordExtended = true;
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.log", true],
["browser.search.serpEventTelemetry.enabled", true],
],
set: [["browser.search.serpEventTelemetry.enabled", true]],
});
registerCleanupFunction(async () => {

5
browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_ads_load_events.js
Просмотреть файл

@ -35,10 +35,7 @@ add_setup(async function () {
let oldCanRecord = Services.telemetry.canRecordExtended;
Services.telemetry.canRecordExtended = true;
await SpecialPowers.pushPrefEnv({
set: [
["browser.search.log", true],
["browser.search.serpEventTelemetry.enabled", true],
],
set: [["browser.search.serpEventTelemetry.enabled", true]],
});
registerCleanupFunction(async () => {

2
browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_in_content.js
Просмотреть файл

@ -49,10 +49,8 @@ add_setup(async function () {
// Enable local telemetry recording for the duration of the tests.
let oldCanRecord = Services.telemetry.canRecordExtended;
Services.telemetry.canRecordExtended = true;
Services.prefs.setBoolPref("browser.search.log", true);
registerCleanupFunction(async () => {
Services.prefs.clearUserPref("browser.search.log");
SearchSERPTelemetry.overrideSearchTelemetryForTests();
Services.telemetry.canRecordExtended = oldCanRecord;
resetTelemetry();

2
browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_navigation.js
Просмотреть файл

@ -64,7 +64,6 @@ add_setup(async function () {
// Enable local telemetry recording for the duration of the tests.
let oldCanRecord = Services.telemetry.canRecordExtended;
Services.telemetry.canRecordExtended = true;
Services.prefs.setBoolPref("browser.search.log", true);
await SearchTestUtils.installSearchExtension(
{
@ -81,7 +80,6 @@ add_setup(async function () {
registerCleanupFunction(async () => {
BrowserTestUtils.removeTab(tab);
Services.prefs.clearUserPref("browser.search.log");
SearchSERPTelemetry.overrideSearchTelemetryForTests();
Services.telemetry.canRecordExtended = oldCanRecord;
resetTelemetry();

2
browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_webextension.js
Просмотреть файл

@ -48,7 +48,6 @@ add_setup(async function () {
// Enable local telemetry recording for the duration of the tests.
let oldCanRecord = Services.telemetry.canRecordExtended;
Services.telemetry.canRecordExtended = true;
Services.prefs.setBoolPref("browser.search.log", true);
await SearchTestUtils.installSearchExtension(
{
@ -65,7 +64,6 @@ add_setup(async function () {
registerCleanupFunction(async () => {
gCUITestUtils.removeSearchBar();
Services.prefs.clearUserPref("browser.search.log");
SearchSERPTelemetry.overrideSearchTelemetryForTests();
Services.telemetry.canRecordExtended = oldCanRecord;
resetTelemetry();