diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-27 01:54:53 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-27 01:54:53 +0000 |
| commit | 0f415a8ec9d219b94fe55ef11b9feb5fdfb2fffb (patch) | |
| tree | 40b8d8d8a47d49bbdf72c28264ae144fcdab4a80 /ipc/ipc_channel_proxy_unittest.cc | |
| parent | 0c2e5cf35a697e4fa3b3b8130a46a776e3d3a752 (diff) | |
| download | chromium_src-0f415a8ec9d219b94fe55ef11b9feb5fdfb2fffb.zip chromium_src-0f415a8ec9d219b94fe55ef11b9feb5fdfb2fffb.tar.gz chromium_src-0f415a8ec9d219b94fe55ef11b9feb5fdfb2fffb.tar.bz2 | |
Disable IPCChannelBadMessageTest.BadMessage on Windows as it's flaking on various win buildbots
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272910 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_channel_proxy_unittest.cc')
| -rw-r--r-- | ipc/ipc_channel_proxy_unittest.cc | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/ipc/ipc_channel_proxy_unittest.cc b/ipc/ipc_channel_proxy_unittest.cc index 0ff2032..bd2381c 100644 --- a/ipc/ipc_channel_proxy_unittest.cc +++ b/ipc/ipc_channel_proxy_unittest.cc @@ -11,10 +11,6 @@ #include "ipc/ipc_test_base.h" #include "ipc/message_filter.h" -#if defined(OS_WIN) -#include "base/win/windows_version.h" -#endif - // Get basic type definitions. #define IPC_MESSAGE_IMPL #include "ipc/ipc_channel_proxy_unittest_messages.h" @@ -388,11 +384,6 @@ class IPCChannelBadMessageTest : public IPCTestBase { virtual ~IPCChannelBadMessageTest() {} virtual void SetUp() OVERRIDE { -#if defined(OS_WIN) - // TODO(jam): for some reason this is failing on XP buildbots. - if (base::win::GetVersion() <= base::win::VERSION_XP) - return; -#endif IPCTestBase::SetUp(); Init("ChannelProxyClient"); @@ -423,16 +414,14 @@ class IPCChannelBadMessageTest : public IPCTestBase { scoped_ptr<QuitListener> listener_; }; +#if !defined(OS_WIN) + // TODO(jam): for some reason this is flaky on win buildbots. TEST_F(IPCChannelBadMessageTest, BadMessage) { -#if defined(OS_WIN) - // TODO(jam): for some reason this is failing on XP buildbots. - if (base::win::GetVersion() <= base::win::VERSION_XP) - return; -#endif sender()->Send(new TestMsg_SendBadMessage()); SendQuitMessageAndWaitForIdle(); EXPECT_TRUE(DidListenerGetBadMessage()); } +#endif #endif |