diff options
| author | pbos@webrtc.org <pbos@webrtc.org> | 2014-10-09 12:47:15 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org> | 2014-10-09 12:47:15 +0000 |
| commit | a6dd90a25a25296bedd61cb5e25ed2bac4ea358b (patch) | |
| tree | 7f8ae37490c2258f89d97ea80228056bcec11305 | |
| parent | d2761c131483660084710eec5cdaad97243877f0 (diff) | |
| download | webrtc-a6dd90a25a25296bedd61cb5e25ed2bac4ea358b.tar.gz | |
Increase timeout for AsyncWriteTest.TestWrite.
Having a 10ms timeout for something meant to run on DrMemory is insane.
TBR=henrike@webrtc.org
BUG=3490
Review URL: https://webrtc-codereview.appspot.com/23959004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7410 4adac7df-926f-26a2-2b94-8c16560cd09d
| -rw-r--r-- | base/stream_unittest.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/base/stream_unittest.cc b/base/stream_unittest.cc index 5c2cb576..e31b092c 100644 --- a/base/stream_unittest.cc +++ b/base/stream_unittest.cc @@ -14,6 +14,9 @@ namespace rtc { +namespace { +static const int kTimeoutMs = 10000; +} // namespace /////////////////////////////////////////////////////////////////////////////// // TestStream /////////////////////////////////////////////////////////////////////////////// @@ -435,7 +438,7 @@ TEST(FifoBufferTest, WriteOffsetAndReadOffset) { EXPECT_EQ(SR_BLOCK, buf.ReadOffset(out, 10, 16, NULL)); } -TEST(AsyncWriteTest, DISABLED_ON_MAC(TestWrite)) { +TEST(AsyncWriteTest, TestWrite) { FifoBuffer* buf = new FifoBuffer(100); AsyncWriteStream stream(buf, Thread::Current()); EXPECT_EQ(SS_OPEN, stream.GetState()); @@ -450,7 +453,8 @@ TEST(AsyncWriteTest, DISABLED_ON_MAC(TestWrite)) { EXPECT_NE(SR_SUCCESS, buf->ReadOffset(&bytes, 3, 0, &count)); // Now we process the messages on the thread's queue, so "abc" has // been written. - EXPECT_TRUE_WAIT(SR_SUCCESS == buf->ReadOffset(&bytes, 3, 0, &count), 10); + EXPECT_TRUE_WAIT(SR_SUCCESS == buf->ReadOffset(&bytes, 3, 0, &count), + kTimeoutMs); EXPECT_EQ(3u, count); EXPECT_EQ(0, memcmp(bytes, "abc", 3)); |