generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Increase timeout for AsyncWriteTest.TestWrite.

Browse Source 
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
This commit is contained in:
pbos@webrtc.org 2014-10-09 12:47:15 +00:00
parent 4bd2db9a55
commit 3ff788cf73
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/valgrind-webrtc/gtest_exclude/libjingle_unittest.gtest-drmemory_win32.txt
View File

@ -1,3 +0,0 @@
# Fails on Dr Memory Full.
# https://code.google.com/p/webrtc/issues/detail?id=3490
AsyncWriteTest.TestWrite

8
webrtc/base/stream_unittest.cc
View File

@ -14,6 +14,9 @@
namespace rtc { namespace rtc {
namespace {
static const int kTimeoutMs = 10000;
} // namespace
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// TestStream // TestStream
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@ -435,7 +438,7 @@ TEST(FifoBufferTest, WriteOffsetAndReadOffset) {
EXPECT_EQ(SR_BLOCK, buf.ReadOffset(out, 10, 16, NULL)); EXPECT_EQ(SR_BLOCK, buf.ReadOffset(out, 10, 16, NULL));
} }
TEST(AsyncWriteTest, DISABLED_ON_MAC(TestWrite)) { TEST(AsyncWriteTest, TestWrite) {
FifoBuffer* buf = new FifoBuffer(100); FifoBuffer* buf = new FifoBuffer(100);
AsyncWriteStream stream(buf, Thread::Current()); AsyncWriteStream stream(buf, Thread::Current());
EXPECT_EQ(SS_OPEN, stream.GetState()); 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)); EXPECT_NE(SR_SUCCESS, buf->ReadOffset(&bytes, 3, 0, &count));
// Now we process the messages on the thread's queue, so "abc" has // Now we process the messages on the thread's queue, so "abc" has
// been written. // 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(3u, count);
EXPECT_EQ(0, memcmp(bytes, "abc", 3)); EXPECT_EQ(0, memcmp(bytes, "abc", 3));