diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 18:14:37 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 18:14:37 +0000 |
| commit | fbe4f18427a9ac0b759bed46b6b31b215de46242 (patch) | |
| tree | 425977e953af69625c97658aa0633a45303595c0 /remoting/protocol | |
| parent | a3caa82f2d87ae876570d1fb9dd220c1e90104d4 (diff) | |
| download | chromium_src-fbe4f18427a9ac0b759bed46b6b31b215de46242.zip chromium_src-fbe4f18427a9ac0b759bed46b6b31b215de46242.tar.gz chromium_src-fbe4f18427a9ac0b759bed46b6b31b215de46242.tar.bz2 | |
Add asserts for timeouts in JingleChromotingConnectionTest.
BUG=57832
TEST=Unittests
Review URL: http://codereview.chromium.org/3606014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63911 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
| -rw-r--r-- | remoting/protocol/jingle_chromoting_connection_unittest.cc | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/remoting/protocol/jingle_chromoting_connection_unittest.cc b/remoting/protocol/jingle_chromoting_connection_unittest.cc index a369124..bb16967 100644 --- a/remoting/protocol/jingle_chromoting_connection_unittest.cc +++ b/remoting/protocol/jingle_chromoting_connection_unittest.cc @@ -164,10 +164,12 @@ class JingleChromotingConnectionTest : public testing::Test { NewCallback(&client_connection_callback_, &MockConnectionCallback::OnStateChange)); - host_connected_event.TimedWait(base::TimeDelta::FromMilliseconds( - TestTimeouts::action_max_timeout_ms())); - client_connected_event.TimedWait(base::TimeDelta::FromMilliseconds( - TestTimeouts::action_max_timeout_ms())); + ASSERT_TRUE( + host_connected_event.TimedWait(base::TimeDelta::FromMilliseconds( + TestTimeouts::action_max_timeout_ms()))); + ASSERT_TRUE( + client_connected_event.TimedWait(base::TimeDelta::FromMilliseconds( + TestTimeouts::action_max_timeout_ms()))); } static void SignalEvent(base::WaitableEvent* event) { @@ -224,8 +226,9 @@ class ChannelTesterBase : public base::RefCountedThreadSafe<ChannelTesterBase> { } void WaitFinished() { - done_event_.TimedWait(base::TimeDelta::FromMilliseconds( - TestTimeouts::action_max_timeout_ms())); + ASSERT_TRUE( + done_event_.TimedWait(base::TimeDelta::FromMilliseconds( + TestTimeouts::action_max_timeout_ms()))); } virtual void CheckResults() = 0; @@ -535,8 +538,9 @@ TEST_F(JingleChromotingConnectionTest, RejectConnection) { NewCallback(&client_connection_callback_, &MockConnectionCallback::OnStateChange)); - done_event.TimedWait( - base::TimeDelta::FromMilliseconds(TestTimeouts::action_max_timeout_ms())); + ASSERT_TRUE( + done_event.TimedWait(base::TimeDelta::FromMilliseconds( + TestTimeouts::action_max_timeout_ms()))); } // Verify that we can connect two endpoints. |