diff options
author | msw <msw@chromium.org> | 2015-06-19 09:26:47 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-19 16:27:25 +0000 |
commit | 8f7f5390795bf273f5fbab6b03fe45ad22ddac8f (patch) | |
tree | 344c2205007f02935883eb03e0f523521fbb00f7 /ipc | |
parent | 972929725afea658f494efdb2876546322391797 (diff) | |
download | chromium_src-8f7f5390795bf273f5fbab6b03fe45ad22ddac8f.zip chromium_src-8f7f5390795bf273f5fbab6b03fe45ad22ddac8f.tar.gz chromium_src-8f7f5390795bf273f5fbab6b03fe45ad22ddac8f.tar.bz2 |
Disable ipc_mojo_unittests that timeout on Android.
See the bug for more info. Here's the FYI waterfall:
http://build.chromium.org/p/chromium.mojo/console
BUG=502290
TEST=Remaining ipc_mojo_unittests pass on Android.
TBR=morrita@chromium.org
NOTRY=TRUE
Review URL: https://codereview.chromium.org/1193933003
Cr-Commit-Position: refs/heads/master@{#335267}
Diffstat (limited to 'ipc')
-rw-r--r-- | ipc/mojo/ipc_channel_mojo_unittest.cc | 57 | ||||
-rw-r--r-- | ipc/mojo/ipc_mojo_bootstrap_unittest.cc | 8 |
2 files changed, 56 insertions, 9 deletions
diff --git a/ipc/mojo/ipc_channel_mojo_unittest.cc b/ipc/mojo/ipc_channel_mojo_unittest.cc index cb5c459..ef8d9a8 100644 --- a/ipc/mojo/ipc_channel_mojo_unittest.cc +++ b/ipc/mojo/ipc_channel_mojo_unittest.cc @@ -145,7 +145,13 @@ class TestChannelListenerWithExtraExpectations bool is_connected_called_; }; -TEST_F(IPCChannelMojoTest, ConnectedFromClient) { +// Times out on Android; see http://crbug.com/502290 +#if defined(OS_ANDROID) +#define MAYBE_ConnectedFromClient DISABLED_ConnectedFromClient +#else +#define MAYBE_ConnectedFromClient ConnectedFromClient +#endif +TEST_F(IPCChannelMojoTest, MAYBE_ConnectedFromClient) { InitWithMojo("IPCChannelMojoTestClient"); // Set up IPC channel and start client. @@ -255,7 +261,13 @@ MULTIPROCESS_IPC_TEST_CLIENT_MAIN(IPCChannelMojoErraticTestClient) { return 0; } -TEST_F(IPCChannelMojoErrorTest, SendFailWithPendingMessages) { +// Times out on Android; see http://crbug.com/502290 +#if defined(OS_ANDROID) +#define MAYBE_SendFailWithPendingMessages DISABLED_SendFailWithPendingMessages +#else +#define MAYBE_SendFailWithPendingMessages SendFailWithPendingMessages +#endif +TEST_F(IPCChannelMojoErrorTest, MAYBE_SendFailWithPendingMessages) { InitWithMojo("IPCChannelMojoErraticTestClient"); // Set up IPC channel and start client. @@ -395,7 +407,13 @@ class ListenerThatExpectsMessagePipe : public IPC::Listener { IPC::Sender* sender_; }; -TEST_F(IPCChannelMojoTest, SendMessagePipe) { +// Times out on Android; see http://crbug.com/502290 +#if defined(OS_ANDROID) +#define MAYBE_SendMessagePipe DISABLED_SendMessagePipe +#else +#define MAYBE_SendMessagePipe SendMessagePipe +#endif +TEST_F(IPCChannelMojoTest, MAYBE_SendMessagePipe) { InitWithMojo("IPCChannelMojoTestSendMessagePipeClient"); ListenerThatExpectsOK listener; @@ -486,7 +504,13 @@ void ParamTraitMessagePipeClient(bool receiving_valid_handle, client.Close(); } -TEST_F(IPCChannelMojoTest, ParamTraitValidMessagePipe) { +// Times out on Android; see http://crbug.com/502290 +#if defined(OS_ANDROID) +#define MAYBE_ParamTraitValidMessagePipe DISABLED_ParamTraitValidMessagePipe +#else +#define MAYBE_ParamTraitValidMessagePipe ParamTraitValidMessagePipe +#endif +TEST_F(IPCChannelMojoTest, MAYBE_ParamTraitValidMessagePipe) { InitWithMojo("ParamTraitValidMessagePipeClient"); ListenerThatExpectsOK listener; @@ -514,7 +538,13 @@ MULTIPROCESS_IPC_TEST_CLIENT_MAIN(ParamTraitValidMessagePipeClient) { return 0; } -TEST_F(IPCChannelMojoTest, ParamTraitInvalidMessagePipe) { +// Times out on Android; see http://crbug.com/502290 +#if defined(OS_ANDROID) +#define MAYBE_ParamTraitInvalidMessagePipe DISABLED_ParamTraitInvalidMessagePipe +#else +#define MAYBE_ParamTraitInvalidMessagePipe ParamTraitInvalidMessagePipe +#endif +TEST_F(IPCChannelMojoTest, MAYBE_ParamTraitInvalidMessagePipe) { InitWithMojo("ParamTraitInvalidMessagePipeClient"); ListenerThatExpectsOK listener; @@ -623,8 +653,13 @@ class ListenerThatExpectsFile : public IPC::Listener { IPC::Sender* sender_; }; - -TEST_F(IPCChannelMojoTest, SendPlatformHandle) { +// Times out on Android; see http://crbug.com/502290 +#if defined(OS_ANDROID) +#define MAYBE_SendPlatformHandle DISABLED_SendPlatformHandle +#else +#define MAYBE_SendPlatformHandle SendPlatformHandle +#endif +TEST_F(IPCChannelMojoTest, MAYBE_SendPlatformHandle) { InitWithMojo("IPCChannelMojoTestSendPlatformHandleClient"); ListenerThatExpectsOK listener; @@ -681,7 +716,13 @@ class ListenerThatExpectsFileAndPipe : public IPC::Listener { IPC::Sender* sender_; }; -TEST_F(IPCChannelMojoTest, SendPlatformHandleAndPipe) { +// Times out on Android; see http://crbug.com/502290 +#if defined(OS_ANDROID) +#define MAYBE_SendPlatformHandleAndPipe DISABLED_SendPlatformHandleAndPipe +#else +#define MAYBE_SendPlatformHandleAndPipe SendPlatformHandleAndPipe +#endif +TEST_F(IPCChannelMojoTest, MAYBE_SendPlatformHandleAndPipe) { InitWithMojo("IPCChannelMojoTestSendPlatformHandleAndPipeClient"); ListenerThatExpectsOK listener; diff --git a/ipc/mojo/ipc_mojo_bootstrap_unittest.cc b/ipc/mojo/ipc_mojo_bootstrap_unittest.cc index d8ce3b7..51c67e7 100644 --- a/ipc/mojo/ipc_mojo_bootstrap_unittest.cc +++ b/ipc/mojo/ipc_mojo_bootstrap_unittest.cc @@ -42,7 +42,13 @@ void TestingDelegate::OnBootstrapError() { base::MessageLoop::current()->Quit(); } -TEST_F(IPCMojoBootstrapTest, Connect) { +// Times out on Android; see http://crbug.com/502290 +#if defined(OS_ANDROID) +#define MAYBE_Connect DISABLED_Connect +#else +#define MAYBE_Connect Connect +#endif +TEST_F(IPCMojoBootstrapTest, MAYBE_Connect) { Init("IPCMojoBootstrapTestClient"); TestingDelegate delegate; |