Skip to content

GitLab

T
tangled
Commit 810c47d4 authored by bmcquade's avatar bmcquade Committed by Commit bot
Browse files
Options

Fix flaky MetricsWebContentsObserverBrowserTests 

This reverts commit 58ac1ade, which
disabled a few flaky tests, and fixes those tests so they are no longer
flaky.

In a follow up change, we'll roll back
https://codereview.chromium.org/2172183002
since this change addresses the flakes caused by that patch.

BUG=630549

Review-Url: https://codereview.chromium.org/2176803002
Cr-Commit-Position: refs/heads/master@{#407260}
parent 913442c0
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 31 deletions
chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
View file @ 810c47d4
...@@ -17,6 +17,10 @@ class MetricsWebContentsObserverBrowserTest : public InProcessBrowserTest { ...@@ -17,6 +17,10 @@ class MetricsWebContentsObserverBrowserTest : public InProcessBrowserTest {
~MetricsWebContentsObserverBrowserTest() override {} ~MetricsWebContentsObserverBrowserTest() override {}
protected: protected:
void NavigateToUntrackedUrl() {
ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
}
base::HistogramTester histogram_tester_; base::HistogramTester histogram_tester_;
DISALLOW_COPY_AND_ASSIGN(MetricsWebContentsObserverBrowserTest); DISALLOW_COPY_AND_ASSIGN(MetricsWebContentsObserverBrowserTest);
...@@ -36,8 +40,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, NewPage) { ...@@ -36,8 +40,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, NewPage) {
ui_test_utils::NavigateToURL(browser(), ui_test_utils::NavigateToURL(browser(),
embedded_test_server()->GetURL("/title1.html")); embedded_test_server()->GetURL("/title1.html"));
ui_test_utils::NavigateToURL(browser(), NavigateToUntrackedUrl();
embedded_test_server()->GetURL("/title2.html"));
histogram_tester_.ExpectTotalCount(internal::kHistogramDomContentLoaded, 1); histogram_tester_.ExpectTotalCount(internal::kHistogramDomContentLoaded, 1);
histogram_tester_.ExpectTotalCount(internal::kHistogramLoad, 1); histogram_tester_.ExpectTotalCount(internal::kHistogramLoad, 1);
...@@ -47,34 +50,30 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, NewPage) { ...@@ -47,34 +50,30 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, NewPage) {
internal::kHistogramParseBlockedOnScriptLoad, 1); internal::kHistogramParseBlockedOnScriptLoad, 1);
} }
// Flaky in win: crbug.com/630076
IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
DISABLED_SamePageNavigation) { SamePageNavigation) {
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
ui_test_utils::NavigateToURL(browser(), ui_test_utils::NavigateToURL(browser(),
embedded_test_server()->GetURL("/title1.html")); embedded_test_server()->GetURL("/title1.html"));
ui_test_utils::NavigateToURL( ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL("/title1.html#hash")); browser(), embedded_test_server()->GetURL("/title1.html#hash"));
ui_test_utils::NavigateToURL(browser(), NavigateToUntrackedUrl();
embedded_test_server()->GetURL("/title2.html"));
histogram_tester_.ExpectTotalCount(internal::kHistogramDomContentLoaded, 1); histogram_tester_.ExpectTotalCount(internal::kHistogramDomContentLoaded, 1);
histogram_tester_.ExpectTotalCount(internal::kHistogramLoad, 1); histogram_tester_.ExpectTotalCount(internal::kHistogramLoad, 1);
histogram_tester_.ExpectTotalCount(internal::kHistogramFirstLayout, 1); histogram_tester_.ExpectTotalCount(internal::kHistogramFirstLayout, 1);
} }
// Flaky in win: crbug.com/630076
IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
DISABLED_SameUrlNavigation) { SameUrlNavigation) {
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
ui_test_utils::NavigateToURL(browser(), ui_test_utils::NavigateToURL(browser(),
embedded_test_server()->GetURL("/title1.html")); embedded_test_server()->GetURL("/title1.html"));
ui_test_utils::NavigateToURL(browser(), ui_test_utils::NavigateToURL(browser(),
embedded_test_server()->GetURL("/title1.html")); embedded_test_server()->GetURL("/title1.html"));
ui_test_utils::NavigateToURL(browser(), NavigateToUntrackedUrl();
embedded_test_server()->GetURL("/title2.html"));
// We expect one histogram sample for each navigation to title1.html. // We expect one histogram sample for each navigation to title1.html.
histogram_tester_.ExpectTotalCount(internal::kHistogramCommit, 2); histogram_tester_.ExpectTotalCount(internal::kHistogramCommit, 2);
...@@ -89,8 +88,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, ...@@ -89,8 +88,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
ui_test_utils::NavigateToURL(browser(), ui_test_utils::NavigateToURL(browser(),
embedded_test_server()->GetURL("/simple.svg")); embedded_test_server()->GetURL("/simple.svg"));
ui_test_utils::NavigateToURL(browser(), NavigateToUntrackedUrl();
embedded_test_server()->GetURL("/title1.html"));
histogram_tester_.ExpectTotalCount(internal::kHistogramCommit, 0); histogram_tester_.ExpectTotalCount(internal::kHistogramCommit, 0);
} }
...@@ -100,8 +98,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, ...@@ -100,8 +98,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIVersionURL)); ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIVersionURL));
ui_test_utils::NavigateToURL(browser(), NavigateToUntrackedUrl();
embedded_test_server()->GetURL("/title1.html"));
histogram_tester_.ExpectTotalCount(internal::kHistogramCommit, 0); histogram_tester_.ExpectTotalCount(internal::kHistogramCommit, 0);
} }
...@@ -113,8 +110,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, ...@@ -113,8 +110,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
ui_test_utils::NavigateToURL( ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL( browser(), embedded_test_server()->GetURL(
"/page_load_metrics/document_write_external_script.html")); "/page_load_metrics/document_write_external_script.html"));
ui_test_utils::NavigateToURL(browser(), NavigateToUntrackedUrl();
embedded_test_server()->GetURL("/title2.html"));
histogram_tester_.ExpectTotalCount( histogram_tester_.ExpectTotalCount(
internal::kHistogramDocWriteParseStartToFirstContentfulPaint, 1); internal::kHistogramDocWriteParseStartToFirstContentfulPaint, 1);
...@@ -127,8 +123,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, ...@@ -127,8 +123,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
ui_test_utils::NavigateToURL( ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL( browser(), embedded_test_server()->GetURL(
"/page_load_metrics/document_write_no_script.html")); "/page_load_metrics/document_write_no_script.html"));
ui_test_utils::NavigateToURL(browser(), NavigateToUntrackedUrl();
embedded_test_server()->GetURL("/title2.html"));
histogram_tester_.ExpectTotalCount( histogram_tester_.ExpectTotalCount(
internal::kHistogramDocWriteParseStartToFirstContentfulPaint, 0); internal::kHistogramDocWriteParseStartToFirstContentfulPaint, 0);
...@@ -139,8 +134,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, NoDocumentWrite) { ...@@ -139,8 +134,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, NoDocumentWrite) {
ui_test_utils::NavigateToURL(browser(), ui_test_utils::NavigateToURL(browser(),
embedded_test_server()->GetURL("/title1.html")); embedded_test_server()->GetURL("/title1.html"));
ui_test_utils::NavigateToURL(browser(), NavigateToUntrackedUrl();
embedded_test_server()->GetURL("/title2.html"));
histogram_tester_.ExpectTotalCount( histogram_tester_.ExpectTotalCount(
internal::kHistogramDocWriteParseStartToFirstContentfulPaint, 0); internal::kHistogramDocWriteParseStartToFirstContentfulPaint, 0);
histogram_tester_.ExpectTotalCount( histogram_tester_.ExpectTotalCount(
...@@ -154,9 +148,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, ...@@ -154,9 +148,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
ui_test_utils::NavigateToURL( ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL( browser(), embedded_test_server()->GetURL(
"/page_load_metrics/document_write_script_block.html")); "/page_load_metrics/document_write_script_block.html"));
NavigateToUntrackedUrl();
ui_test_utils::NavigateToURL(browser(),
embedded_test_server()->GetURL("/title2.html"));
histogram_tester_.ExpectTotalCount( histogram_tester_.ExpectTotalCount(
internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 1); internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 1);
...@@ -182,8 +174,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, ...@@ -182,8 +174,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
histogram_tester_.ExpectTotalCount( histogram_tester_.ExpectTotalCount(
internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 1); internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 1);
ui_test_utils::NavigateToURL(browser(), NavigateToUntrackedUrl();
embedded_test_server()->GetURL("/title2.html"));
histogram_tester_.ExpectTotalCount( histogram_tester_.ExpectTotalCount(
internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 1); internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 1);
...@@ -199,8 +190,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, ...@@ -199,8 +190,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
ui_test_utils::NavigateToURL( ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL( browser(), embedded_test_server()->GetURL(
"/page_load_metrics/document_write_script_async.html")); "/page_load_metrics/document_write_script_async.html"));
ui_test_utils::NavigateToURL(browser(), NavigateToUntrackedUrl();
embedded_test_server()->GetURL("/title2.html"));
histogram_tester_.ExpectTotalCount( histogram_tester_.ExpectTotalCount(
internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 0); internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 0);
...@@ -213,8 +203,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, ...@@ -213,8 +203,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
ui_test_utils::NavigateToURL( ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL( browser(), embedded_test_server()->GetURL(
"/page_load_metrics/document_write_external_script.html")); "/page_load_metrics/document_write_external_script.html"));
ui_test_utils::NavigateToURL(browser(), NavigateToUntrackedUrl();
embedded_test_server()->GetURL("/title2.html"));
histogram_tester_.ExpectTotalCount( histogram_tester_.ExpectTotalCount(
internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 0); internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 0);
...@@ -227,8 +216,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, ...@@ -227,8 +216,7 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest,
ui_test_utils::NavigateToURL( ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL( browser(), embedded_test_server()->GetURL(
"/page_load_metrics/document_write_no_script.html")); "/page_load_metrics/document_write_no_script.html"));
ui_test_utils::NavigateToURL(browser(), NavigateToUntrackedUrl();
embedded_test_server()->GetURL("/title2.html"));
histogram_tester_.ExpectTotalCount( histogram_tester_.ExpectTotalCount(
internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 0); internal::kHistogramDocWriteBlockParseStartToFirstContentfulPaint, 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment