summaryrefslogtreecommitdiffstats
path: root/remoting/protocol
diff options
context:
space:
mode:
Diffstat (limited to 'remoting/protocol')
-rw-r--r--remoting/protocol/jingle_chromoting_connection_unittest.cc20
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.