diff options
| author | lambroslambrou <lambroslambrou@chromium.org> | 2015-12-07 17:15:22 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-08 01:16:36 +0000 |
| commit | 459e1b770c902299f301a99d893cb84f110357ab (patch) | |
| tree | c210344914fe5ffd8b029bd3e529c40092f22dba /components/html_viewer | |
| parent | fd2986d06d57ad04fc6f8db79ddb7a42d6445e03 (diff) | |
| download | chromium_src-459e1b770c902299f301a99d893cb84f110357ab.zip chromium_src-459e1b770c902299f301a99d893cb84f110357ab.tar.gz chromium_src-459e1b770c902299f301a99d893cb84f110357ab.tar.bz2 | |
Disable some mojo_apptests that are blocking CQ
This disables
HTMLFrameTest.ChangeLocationOfChildFrame
HTMLFrameTest.PageWithSingleFrame
FrameTest.ChildFrameClientConnectData
as they are flaking on linux_chromium_rel_ng:
https://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_rel_ng/builds/151118
https://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_rel_ng/builds/151659
TBR=sky,ben
R=caitkp
BUG=567337
Review URL: https://codereview.chromium.org/1504033004
Cr-Commit-Position: refs/heads/master@{#363670}
Diffstat (limited to 'components/html_viewer')
| -rw-r--r-- | components/html_viewer/html_frame_apptest.cc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/components/html_viewer/html_frame_apptest.cc b/components/html_viewer/html_frame_apptest.cc index 0bfba84f..1c91b65 100644 --- a/components/html_viewer/html_frame_apptest.cc +++ b/components/html_viewer/html_frame_apptest.cc @@ -261,7 +261,13 @@ class HTMLFrameTest : public WindowServerTestBase { DISALLOW_COPY_AND_ASSIGN(HTMLFrameTest); }; -TEST_F(HTMLFrameTest, PageWithSingleFrame) { +// Crashes on linux_chromium_rel_ng only. http://crbug.com/567337 +#if defined(OS_LINUX) +#define MAYBE_PageWithSingleFrame DISABLED_PageWithSingleFrame +#else +#define MAYBE_PageWithSingleFrame PageWithSingleFrame +#endif +TEST_F(HTMLFrameTest, MAYBE_PageWithSingleFrame) { mus::Window* embed_window = window_manager()->NewWindow(); FrameConnection* root_connection = InitFrameTree( @@ -286,7 +292,13 @@ TEST_F(HTMLFrameTest, PageWithSingleFrame) { // Creates two frames. The parent navigates the child frame by way of changing // the location of the child frame. -TEST_F(HTMLFrameTest, ChangeLocationOfChildFrame) { +// Crashes on linux_chromium_rel_ng only. http://crbug.com/567337 +#if defined(OS_LINUX) +#define MAYBE_ChangeLocationOfChildFrame DISABLED_ChangeLocationOfChildFrame +#else +#define MAYBE_ChangeLocationOfChildFrame ChangeLocationOfChildFrame +#endif +TEST_F(HTMLFrameTest, MAYBE_ChangeLocationOfChildFrame) { mus::Window* embed_window = window_manager()->NewWindow(); ASSERT_TRUE(InitFrameTree( |