diff options
| author | danakj <danakj@chromium.org> | 2015-12-09 14:42:18 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-09 22:43:53 +0000 |
| commit | 9930dbedfe756e1fa79e962b3b928776e16b64dc (patch) | |
| tree | 6d72580a896318de4417dc53c3b99666de3a1099 | |
| parent | 048b41c61d7e61dcf736142d3443ca84f2497fc6 (diff) | |
| download | chromium_src-9930dbedfe756e1fa79e962b3b928776e16b64dc.zip chromium_src-9930dbedfe756e1fa79e962b3b928776e16b64dc.tar.gz chromium_src-9930dbedfe756e1fa79e962b3b928776e16b64dc.tar.bz2 | |
Reland of Disabling SessionRestoreTest.WindowWithOneTab for Linux. (patchset #1 id:1 of https://codereview.chromium.org/1514583003/ )
Reason for revert:
Nevermind, broken on ToT!
Original issue's description:
> Revert of Disabling SessionRestoreTest.WindowWithOneTab for Linux. (patchset #1 id:1 of https://codereview.chromium.org/1376193002/ )
>
> Reason for revert:
> Probably fixed by https://codereview.chromium.org/1426533007
>
> Original issue's description:
> > Disabling SessionRestoreTest.WindowWithOneTab for Linux.
> >
> > TBR=marja@chromium.org
> > BUG=537592
> >
> > Committed: https://crrev.com/2a2f41c11525ba4874688ebb7219579efcf413f1
> > Cr-Commit-Position: refs/heads/master@{#351550}
>
> TBR=sky@chromium.org,phoglund@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=537592
>
> Committed: https://crrev.com/1e787cde9da298f5b11eb5dcd39067ee14b2f82a
> Cr-Commit-Position: refs/heads/master@{#364179}
TBR=sky@chromium.org,phoglund@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=537592
Review URL: https://codereview.chromium.org/1513643006
Cr-Commit-Position: refs/heads/master@{#364183}
| -rw-r--r-- | chrome/browser/sessions/session_restore_browsertest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc index 9e30d45..975f35e 100644 --- a/chrome/browser/sessions/session_restore_browsertest.cc +++ b/chrome/browser/sessions/session_restore_browsertest.cc @@ -571,7 +571,14 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreIndividualTabFromWindow) { EXPECT_EQ(http_status_code, entry->GetHttpStatusCode()); } -IN_PROC_BROWSER_TEST_F(SessionRestoreTest, WindowWithOneTab) { +// Flaky on Linux. https://crbug.com/537592. +#if defined (OS_LINUX) +#define MAYBE_WindowWithOneTab DISABLED_WindowWithOneTab +#else +#define MAYBE_WindowWithOneTab WindowWithOneTab +#endif + +IN_PROC_BROWSER_TEST_F(SessionRestoreTest, MAYBE_WindowWithOneTab) { GURL url(ui_test_utils::GetTestUrl( base::FilePath(base::FilePath::kCurrentDirectory), base::FilePath(FILE_PATH_LITERAL("title1.html")))); |