From 3ff788cf7317787c23366a52b41474d7aa25d289 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Thu, 9 Oct 2014 12:47:15 +0000 Subject: [PATCH] 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@7410 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../libjingle_unittest.gtest-drmemory_win32.txt | 3 --- webrtc/base/stream_unittest.cc | 8 ++++++-- 2 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 tools/valgrind-webrtc/gtest_exclude/libjingle_unittest.gtest-drmemory_win32.txt diff --git a/tools/valgrind-webrtc/gtest_exclude/libjingle_unittest.gtest-drmemory_win32.txt b/tools/valgrind-webrtc/gtest_exclude/libjingle_unittest.gtest-drmemory_win32.txt deleted file mode 100644 index 5ba7b9aa95..0000000000 --- a/tools/valgrind-webrtc/gtest_exclude/libjingle_unittest.gtest-drmemory_win32.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Fails on Dr Memory Full. -# https://code.google.com/p/webrtc/issues/detail?id=3490 -AsyncWriteTest.TestWrite diff --git a/webrtc/base/stream_unittest.cc b/webrtc/base/stream_unittest.cc index 5c2cb576eb..e31b092c45 100644 --- a/webrtc/base/stream_unittest.cc +++ b/webrtc/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));