Skip to content

Commit

Permalink
Revert of Disable DomDistillerViewerSourceBrowserTest.NoWebUIBindings…
Browse files Browse the repository at this point in the history
…Article{Exists,NotFound} tests. (patchset chromium#2 id:20001 of https://codereview.chromium.org/1911733002/ )

Reason for revert:
A change landed that fixes the reason these became flaky (https://codereview.chromium.org/1920563002/).

Original issue's description:
> Disable DomDistillerViewerSourceBrowserTest.NoWebUIBindingsArticle{Exists,NotFound} tests.
>
> Starting with https://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%281%29/builds/53656
> these tests became flaky:
> DomDistillerViewerSourceBrowserTest.NoWebUIBindingsArticleExists
> DomDistillerViewerSourceBrowserTest.NoWebUIBindingsArticleNotFound
>
> BUG=605432
> TBR=nyquist@chromium.org
>
> Committed: https://crrev.com/620c8a6cf23eebb0497ff4e64216fdaa8818433a
> Cr-Commit-Position: refs/heads/master@{#388722}

TBR=nyquist@chromium.org,kjellander@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=605432

Review-Url: https://codereview.chromium.org/1969993002
Cr-Commit-Position: refs/heads/master@{#393136}
  • Loading branch information
iotitan authored and Commit bot committed May 12, 2016
1 parent 42f503d commit e9599ec
Showing 1 changed file with 2 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -169,14 +169,8 @@ MockDistillerFactory* DomDistillerViewerSourceBrowserTest::distiller_factory_ =

// The DomDistillerViewerSource renders untrusted content, so ensure no bindings
// are enabled when the article exists in the database.
// Flaky on Linux Debug, see http://crbug.com/605432.
#if defined(OS_LINUX) && !defined(NDEBUG)
#define MAYBE_NoWebUIBindingsArticleExists DISABLED_NoWebUIBindingsArticleExists
#else
#define MAYBE_NoWebUIBindingsArticleExists NoWebUIBindingsArticleExists
#endif
IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest,
MAYBE_NoWebUIBindingsArticleExists) {
NoWebUIBindingsArticleExists) {
// Ensure there is one item in the database, which will trigger distillation.
const ArticleEntry entry = CreateEntry("DISTILLED", "http://example.com/1");
AddEntry(entry, database_model_);
Expand All @@ -189,14 +183,8 @@ IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest,

// The DomDistillerViewerSource renders untrusted content, so ensure no bindings
// are enabled when the article is not found.
// Flaky on Linux Debug, see http://crbug.com/605432.
#if defined(OS_LINUX) && !defined(NDEBUG)
#define MAYBE_NoWebUIBindingsArticleNotFound DISABLED_NoWebUIBindingsArticleNotFound
#else
#define MAYBE_NoWebUIBindingsArticleNotFound NoWebUIBindingsArticleNotFound
#endif
IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest,
MAYBE_NoWebUIBindingsArticleNotFound) {
NoWebUIBindingsArticleNotFound) {
// The article does not exist, so assume no distillation will happen.
expect_distillation_ = false;
expect_distiller_page_ = false;
Expand Down

0 comments on commit e9599ec

Please sign in to comment.