author | Sebastian Hengst <archaeopteryx@coole-files.de> |
Mon, 17 Jul 2017 18:51:06 +0200 | |
changeset 369288 | cde0022cc6e66802188fe1e24510df5e60598678 |
parent 369287 | d13067985d255619ed26d4e94a991b78c0a08072 |
child 369290 | 5e73b9798464c3f7106f0161dc9a49b234f42f9c |
child 369400 | c135a38a76a806508fe5d12493441e2fea082b3c |
push id | 46631 |
push user | kwierso@gmail.com |
push date | Tue, 18 Jul 2017 00:38:28 +0000 |
treeherder | autoland@216a5bf264b2 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | backout |
bugs | 1361855 |
milestone | 56.0a1 |
backs out | 8df92cb52eb45d99cb3239150879de98bf4c4015 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/browser/modules/test/browser/browser_UsageTelemetry_content.js +++ b/browser/modules/test/browser/browser_UsageTelemetry_content.js @@ -40,17 +40,17 @@ add_task(async function setup() { Services.telemetry.setEventRecordingEnabled("navigation", false); }); }); add_task(async function test_context_menu() { // Let's reset the Telemetry data. Services.telemetry.clearScalars(); Services.telemetry.clearEvents(); - let search_hist = getAndClearKeyedHistogram("SEARCH_COUNTS"); + let search_hist = getSearchCountsHistogram(); // Open a new tab with a page containing some text. let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "data:text/plain;charset=utf8,test%20search"); info("Select all the text in the page."); await ContentTask.spawn(tab.linkedBrowser, "", async function() { return new Promise(resolve => { @@ -88,17 +88,17 @@ add_task(async function test_context_men await BrowserTestUtils.removeTab(gBrowser.selectedTab); await BrowserTestUtils.removeTab(tab); }); add_task(async function test_about_newtab() { // Let's reset the counts. Services.telemetry.clearScalars(); Services.telemetry.clearEvents(); - let search_hist = getAndClearKeyedHistogram("SEARCH_COUNTS"); + let search_hist = getSearchCountsHistogram(); let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:newtab", false); await ContentTask.spawn(tab.linkedBrowser, null, async function() { await ContentTaskUtils.waitForCondition(() => !content.document.hidden); }); info("Trigger a simple serch, just text + enter."); let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
--- a/browser/modules/test/browser/browser_UsageTelemetry_content_aboutHome.js +++ b/browser/modules/test/browser/browser_UsageTelemetry_content_aboutHome.js @@ -42,17 +42,17 @@ add_task(async function setup() { Services.telemetry.setEventRecordingEnabled("navigation", false); }); }); add_task(async function test_abouthome_simpleQuery() { // Let's reset the counts. Services.telemetry.clearScalars(); Services.telemetry.clearEvents(); - let search_hist = getAndClearKeyedHistogram("SEARCH_COUNTS"); + let search_hist = getSearchCountsHistogram(); let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser); info("Setup waiting for AboutHomeLoadSnippetsCompleted."); let promiseAboutHomeLoaded = new Promise(resolve => { tab.linkedBrowser.addEventListener("AboutHomeLoadSnippetsCompleted", function loadListener(event) { tab.linkedBrowser.removeEventListener("AboutHomeLoadSnippetsCompleted", loadListener, true); resolve();
--- a/browser/modules/test/browser/browser_UsageTelemetry_searchbar.js +++ b/browser/modules/test/browser/browser_UsageTelemetry_searchbar.js @@ -101,18 +101,19 @@ add_task(async function setup() { Services.telemetry.setEventRecordingEnabled("navigation", false); }); }); add_task(async function test_plainQuery() { // Let's reset the counts. Services.telemetry.clearScalars(); Services.telemetry.clearEvents(); - let resultMethodHist = getAndClearHistogram("FX_SEARCHBAR_SELECTED_RESULT_METHOD"); - let search_hist = getAndClearKeyedHistogram("SEARCH_COUNTS"); + let resultMethodHist = Services.telemetry.getHistogramById("FX_SEARCHBAR_SELECTED_RESULT_METHOD"); + resultMethodHist.clear(); + let search_hist = getSearchCountsHistogram(); let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:blank"); info("Simulate entering a simple search."); let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser); await searchInSearchbar("simple query"); EventUtils.sendKey("return"); await p; @@ -141,18 +142,19 @@ add_task(async function test_plainQuery( }); // Performs a search using the first result, a one-off button, and the Return // (Enter) key. add_task(async function test_oneOff_enter() { // Let's reset the counts. Services.telemetry.clearScalars(); Services.telemetry.clearEvents(); - let resultMethodHist = getAndClearHistogram("FX_SEARCHBAR_SELECTED_RESULT_METHOD"); - let search_hist = getAndClearKeyedHistogram("SEARCH_COUNTS"); + let resultMethodHist = Services.telemetry.getHistogramById("FX_SEARCHBAR_SELECTED_RESULT_METHOD"); + resultMethodHist.clear(); + let search_hist = getSearchCountsHistogram(); let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:blank"); info("Perform a one-off search using the first engine."); let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser); await searchInSearchbar("query"); info("Pressing Alt+Down to highlight the first one off engine."); @@ -184,17 +186,18 @@ add_task(async function test_oneOff_ente }); // Performs a search using the second result, a one-off button, and the Return // (Enter) key. This only tests the FX_SEARCHBAR_SELECTED_RESULT_METHOD // histogram since test_oneOff_enter covers everything else. add_task(async function test_oneOff_enterSelection() { // Let's reset the counts. Services.telemetry.clearScalars(); - let resultMethodHist = getAndClearHistogram("FX_SEARCHBAR_SELECTED_RESULT_METHOD"); + let resultMethodHist = Services.telemetry.getHistogramById("FX_SEARCHBAR_SELECTED_RESULT_METHOD"); + resultMethodHist.clear(); // Create an engine to generate search suggestions and add it as default // for this test. const url = getRootDirectory(gTestPath) + "usageTelemetrySearchSuggestions.xml"; let suggestionEngine = await new Promise((resolve, reject) => { Services.search.addEngine(url, null, "", false, { onSuccess(engine) { resolve(engine) }, onError() { reject() } @@ -227,17 +230,18 @@ add_task(async function test_oneOff_ente }); // Performs a search using a click on a one-off button. This only tests the // FX_SEARCHBAR_SELECTED_RESULT_METHOD histogram since test_oneOff_enter covers // everything else. add_task(async function test_oneOff_click() { // Let's reset the counts. Services.telemetry.clearScalars(); - let resultMethodHist = getAndClearHistogram("FX_SEARCHBAR_SELECTED_RESULT_METHOD"); + let resultMethodHist = Services.telemetry.getHistogramById("FX_SEARCHBAR_SELECTED_RESULT_METHOD"); + resultMethodHist.clear(); let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:blank"); info("Type a query."); let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser); await searchInSearchbar("query"); info("Click the first one-off button."); BrowserSearch.searchBar.textbox.popup.oneOffButtons.getSelectableButtons(false)[0].click(); @@ -251,18 +255,19 @@ add_task(async function test_oneOff_clic await BrowserTestUtils.removeTab(tab); }); // Clicks the first suggestion offered by the test search engine. add_task(async function test_suggestion_click() { // Let's reset the counts. Services.telemetry.clearScalars(); Services.telemetry.clearEvents(); - let resultMethodHist = getAndClearHistogram("FX_SEARCHBAR_SELECTED_RESULT_METHOD"); - let search_hist = getAndClearKeyedHistogram("SEARCH_COUNTS"); + let resultMethodHist = Services.telemetry.getHistogramById("FX_SEARCHBAR_SELECTED_RESULT_METHOD"); + resultMethodHist.clear(); + let search_hist = getSearchCountsHistogram(); // Create an engine to generate search suggestions and add it as default // for this test. const url = getRootDirectory(gTestPath) + "usageTelemetrySearchSuggestions.xml"; let suggestionEngine = await new Promise((resolve, reject) => { Services.search.addEngine(url, null, "", false, { onSuccess(engine) { resolve(engine) }, onError() { reject() } @@ -309,17 +314,18 @@ add_task(async function test_suggestion_ // Selects and presses the Return (Enter) key on the first suggestion offered by // the test search engine. This only tests the // FX_SEARCHBAR_SELECTED_RESULT_METHOD histogram since test_suggestion_click // covers everything else. add_task(async function test_suggestion_enterSelection() { // Let's reset the counts. Services.telemetry.clearScalars(); - let resultMethodHist = getAndClearHistogram("FX_SEARCHBAR_SELECTED_RESULT_METHOD"); + let resultMethodHist = Services.telemetry.getHistogramById("FX_SEARCHBAR_SELECTED_RESULT_METHOD"); + resultMethodHist.clear(); // Create an engine to generate search suggestions and add it as default // for this test. const url = getRootDirectory(gTestPath) + "usageTelemetrySearchSuggestions.xml"; let suggestionEngine = await new Promise((resolve, reject) => { Services.search.addEngine(url, null, "", false, { onSuccess(engine) { resolve(engine) }, onError() { reject() }
--- a/browser/modules/test/browser/browser_UsageTelemetry_urlbar.js +++ b/browser/modules/test/browser/browser_UsageTelemetry_urlbar.js @@ -103,22 +103,26 @@ add_task(async function setup() { Services.telemetry.setEventRecordingEnabled("navigation", false); }); }); add_task(async function test_simpleQuery() { // Let's reset the counts. Services.telemetry.clearScalars(); Services.telemetry.clearEvents(); + let resultIndexHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_INDEX"); + let resultTypeHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_TYPE"); + let resultMethodHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_METHOD"); + let resultIndexByTypeHist = Services.telemetry.getKeyedHistogramById("FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE"); + resultIndexByTypeHist.clear(); + resultIndexHist.clear(); + resultTypeHist.clear(); + resultMethodHist.clear(); - let resultIndexHist = getAndClearHistogram("FX_URLBAR_SELECTED_RESULT_INDEX"); - let resultTypeHist = getAndClearHistogram("FX_URLBAR_SELECTED_RESULT_TYPE"); - let resultIndexByTypeHist = getAndClearKeyedHistogram("FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE"); - let resultMethodHist = getAndClearHistogram("FX_URLBAR_SELECTED_RESULT_METHOD"); - let search_hist = getAndClearKeyedHistogram("SEARCH_COUNTS"); + let search_hist = getSearchCountsHistogram(); let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:blank"); info("Simulate entering a simple search."); let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser); await searchInAwesomebar("simple query"); EventUtils.sendKey("return"); await p; @@ -158,22 +162,26 @@ add_task(async function test_simpleQuery await BrowserTestUtils.removeTab(tab); }); add_task(async function test_searchAlias() { // Let's reset the counts. Services.telemetry.clearScalars(); Services.telemetry.clearEvents(); + let resultIndexHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_INDEX"); + let resultTypeHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_TYPE"); + let resultIndexByTypeHist = Services.telemetry.getKeyedHistogramById("FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE"); + let resultMethodHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_METHOD"); + resultIndexByTypeHist.clear(); + resultIndexHist.clear(); + resultTypeHist.clear(); + resultMethodHist.clear(); - let resultIndexHist = getAndClearHistogram("FX_URLBAR_SELECTED_RESULT_INDEX"); - let resultTypeHist = getAndClearHistogram("FX_URLBAR_SELECTED_RESULT_TYPE"); - let resultIndexByTypeHist = getAndClearKeyedHistogram("FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE"); - let resultMethodHist = getAndClearHistogram("FX_URLBAR_SELECTED_RESULT_METHOD"); - let search_hist = getAndClearKeyedHistogram("SEARCH_COUNTS"); + let search_hist = getSearchCountsHistogram(); let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:blank"); info("Search using a search alias."); let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser); await searchInAwesomebar("mozalias query"); EventUtils.sendKey("return"); await p; @@ -215,22 +223,26 @@ add_task(async function test_searchAlias }); // Performs a search using the first result, a one-off button, and the Return // (Enter) key. add_task(async function test_oneOff_enter() { // Let's reset the counts. Services.telemetry.clearScalars(); Services.telemetry.clearEvents(); + let resultIndexHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_INDEX"); + let resultTypeHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_TYPE"); + let resultIndexByTypeHist = Services.telemetry.getKeyedHistogramById("FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE"); + let resultMethodHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_METHOD"); + resultIndexByTypeHist.clear(); + resultIndexHist.clear(); + resultTypeHist.clear(); + resultMethodHist.clear(); - let resultIndexHist = getAndClearHistogram("FX_URLBAR_SELECTED_RESULT_INDEX"); - let resultTypeHist = getAndClearHistogram("FX_URLBAR_SELECTED_RESULT_TYPE"); - let resultIndexByTypeHist = getAndClearKeyedHistogram("FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE"); - let resultMethodHist = getAndClearHistogram("FX_URLBAR_SELECTED_RESULT_METHOD"); - let search_hist = getAndClearKeyedHistogram("SEARCH_COUNTS"); + let search_hist = getSearchCountsHistogram(); let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:blank"); info("Perform a one-off search using the first engine."); let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser); await searchInAwesomebar("query"); info("Pressing Alt+Down to take us to the first one-off engine."); @@ -276,17 +288,18 @@ add_task(async function test_oneOff_ente // Performs a search using the second result, a one-off button, and the Return // (Enter) key. This only tests the FX_URLBAR_SELECTED_RESULT_METHOD histogram // since test_oneOff_enter covers everything else. add_task(async function test_oneOff_enterSelection() { // Let's reset the counts. Services.telemetry.clearScalars(); - let resultMethodHist = getAndClearHistogram("FX_URLBAR_SELECTED_RESULT_METHOD"); + let resultMethodHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_METHOD"); + resultMethodHist.clear(); // Create an engine to generate search suggestions and add it as default // for this test. const url = getRootDirectory(gTestPath) + "usageTelemetrySearchSuggestions.xml"; let suggestionEngine = await new Promise((resolve, reject) => { Services.search.addEngine(url, null, "", false, { onSuccess(engine) { resolve(engine) }, onError() { reject() } @@ -320,17 +333,18 @@ add_task(async function test_oneOff_ente // Performs a search using a click on a one-off button. This only tests the // FX_URLBAR_SELECTED_RESULT_METHOD histogram since test_oneOff_enter covers // everything else. add_task(async function test_oneOff_click() { // Let's reset the counts. Services.telemetry.clearScalars(); - let resultMethodHist = getAndClearHistogram("FX_URLBAR_SELECTED_RESULT_METHOD"); + let resultMethodHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_METHOD"); + resultMethodHist.clear(); let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:blank"); info("Type a query."); let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser); await searchInAwesomebar("query"); info("Click the first one-off button."); gURLBar.popup.oneOffSearchButtons.getSelectableButtons(false)[0].click(); @@ -344,22 +358,26 @@ add_task(async function test_oneOff_clic await BrowserTestUtils.removeTab(tab); }); // Clicks the first suggestion offered by the test search engine. add_task(async function test_suggestion_click() { // Let's reset the counts. Services.telemetry.clearScalars(); Services.telemetry.clearEvents(); + let resultIndexHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_INDEX"); + let resultTypeHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_TYPE"); + let resultIndexByTypeHist = Services.telemetry.getKeyedHistogramById("FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE"); + let resultMethodHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_METHOD"); + resultIndexByTypeHist.clear(); + resultIndexHist.clear(); + resultTypeHist.clear(); + resultMethodHist.clear(); - let resultIndexHist = getAndClearHistogram("FX_URLBAR_SELECTED_RESULT_INDEX"); - let resultTypeHist = getAndClearHistogram("FX_URLBAR_SELECTED_RESULT_TYPE"); - let resultIndexByTypeHist = getAndClearKeyedHistogram("FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE"); - let resultMethodHist = getAndClearHistogram("FX_URLBAR_SELECTED_RESULT_METHOD"); - let search_hist = getAndClearKeyedHistogram("SEARCH_COUNTS"); + let search_hist = getSearchCountsHistogram(); // Create an engine to generate search suggestions and add it as default // for this test. const url = getRootDirectory(gTestPath) + "usageTelemetrySearchSuggestions.xml"; let suggestionEngine = await new Promise((resolve, reject) => { Services.search.addEngine(url, null, "", false, { onSuccess(engine) { resolve(engine) }, onError() { reject() } @@ -419,17 +437,18 @@ add_task(async function test_suggestion_ // Selects and presses the Return (Enter) key on the first suggestion offered by // the test search engine. This only tests the FX_URLBAR_SELECTED_RESULT_METHOD // histogram since test_suggestion_click covers everything else. add_task(async function test_suggestion_enterSelection() { // Let's reset the counts. Services.telemetry.clearScalars(); - let resultMethodHist = getAndClearHistogram("FX_URLBAR_SELECTED_RESULT_METHOD"); + let resultMethodHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_METHOD"); + resultMethodHist.clear(); // Create an engine to generate search suggestions and add it as default // for this test. const url = getRootDirectory(gTestPath) + "usageTelemetrySearchSuggestions.xml"; let suggestionEngine = await new Promise((resolve, reject) => { Services.search.addEngine(url, null, "", false, { onSuccess(engine) { resolve(engine) }, onError() { reject() }
--- a/browser/modules/test/browser/head.js +++ b/browser/modules/test/browser/head.js @@ -71,41 +71,25 @@ let typeInSearchField = async function(b await ContentTask.spawn(browser, [fieldName, text], async function([contentFieldName, contentText]) { // Put the focus on the search box. let searchInput = content.document.getElementById(contentFieldName); searchInput.focus(); searchInput.value = contentText; }); }; - /** - * Clear and get the named histogram - * @param {String} name - * The name of the histogram + * Clear and get the SEARCH_COUNTS histogram. */ -function getAndClearHistogram(name) { - let histogram = Services.telemetry.getHistogramById(name); - histogram.clear(); - return histogram; +function getSearchCountsHistogram() { + let search_hist = Services.telemetry.getKeyedHistogramById("SEARCH_COUNTS"); + search_hist.clear(); + return search_hist; } - -/** - * Clear and get the named keyed histogram - * @param {String} name - * The name of the keyed histogram - */ -function getAndClearKeyedHistogram(name) { - let histogram = Services.telemetry.getKeyedHistogramById(name); - histogram.clear(); - return histogram; -} - - /** * Check that the keyed histogram contains the right value. */ function checkKeyedHistogram(h, key, expectedValue) { const snapshot = h.snapshot(); Assert.ok(key in snapshot, `The histogram must contain ${key}.`); Assert.equal(snapshot[key].sum, expectedValue, `The key ${key} must contain ${expectedValue}.`); }