diff options
| -rw-r--r-- | base/observer_list_unittest.cc | 2 | ||||
| -rw-r--r-- | base/thread_collision_warner_unittest.cc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/base/observer_list_unittest.cc b/base/observer_list_unittest.cc index 332de367f..ba4b5de 100644 --- a/base/observer_list_unittest.cc +++ b/base/observer_list_unittest.cc @@ -83,7 +83,7 @@ class AddInObserve : public Foo { class ObserverListThreadSafeTest : public testing::Test { }; -static const int kThreadRunTime = 10000; // ms to run the multi-threaded test. +static const int kThreadRunTime = 2000; // ms to run the multi-threaded test. // A thread for use in the ThreadSafeObserver test // which will add and remove itself from the notification diff --git a/base/thread_collision_warner_unittest.cc b/base/thread_collision_warner_unittest.cc index 238927a..b70cfbe 100644 --- a/base/thread_collision_warner_unittest.cc +++ b/base/thread_collision_warner_unittest.cc @@ -238,7 +238,7 @@ TEST(ThreadCollisionTest, MTScopedBookCriticalSectionTest) { } TEST(ThreadCollisionTest, MTSynchedScopedBookCriticalSectionTest) { - // Queue with a 5 seconds push execution time, hopefuly the two used threads + // Queue with a 2 seconds push execution time, hopefuly the two used threads // in the test will enter the push at same time. class NonThreadSafeQueue { public: @@ -248,7 +248,7 @@ TEST(ThreadCollisionTest, MTSynchedScopedBookCriticalSectionTest) { void push(int value) { DFAKE_SCOPED_LOCK(push_pop_); - PlatformThread::Sleep(5000); + PlatformThread::Sleep(2000); } int pop() { @@ -307,7 +307,7 @@ TEST(ThreadCollisionTest, MTSynchedScopedBookCriticalSectionTest) { } TEST(ThreadCollisionTest, MTSynchedScopedRecursiveBookCriticalSectionTest) { - // Queue with a 5 seconds push execution time, hopefuly the two used threads + // Queue with a 2 seconds push execution time, hopefuly the two used threads // in the test will enter the push at same time. class NonThreadSafeQueue { public: @@ -318,7 +318,7 @@ TEST(ThreadCollisionTest, MTSynchedScopedRecursiveBookCriticalSectionTest) { void push(int) { DFAKE_SCOPED_RECURSIVE_LOCK(push_pop_); bar(); - PlatformThread::Sleep(5000); + PlatformThread::Sleep(2000); } int pop() { |