summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorsergeyu <sergeyu@chromium.org>2015-10-15 13:21:51 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-15 20:22:34 +0000
commit5567f52ed2712cb190835cf3feb093b53745190e (patch)
treea19428d1e73451be7450fb7bcbd75c243dd36d09 /remoting
parentc112cb75e9e298014b1357c8b86434d692f6947c (diff)
downloadchromium_src-5567f52ed2712cb190835cf3feb093b53745190e.zip
chromium_src-5567f52ed2712cb190835cf3feb093b53745190e.tar.gz
chromium_src-5567f52ed2712cb190835cf3feb093b53745190e.tar.bz2
Fix JingleSessionTest.TestQuicStreamChannel to pass reliably.
Previously the test was failing on mac under valgrind because some expectations were set too late. BUG=543431 Review URL: https://codereview.chromium.org/1396643003 Cr-Commit-Position: refs/heads/master@{#354335}
Diffstat (limited to 'remoting')
-rw-r--r--remoting/protocol/jingle_session_unittest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc
index a3e986b..8a643c3 100644
--- a/remoting/protocol/jingle_session_unittest.cc
+++ b/remoting/protocol/jingle_session_unittest.cc
@@ -530,11 +530,12 @@ TEST_F(JingleSessionTest, TestQuicStreamChannel) {
config->PreferTransport(ChannelConfig::TRANSPORT_QUIC_STREAM);
client_server_->set_protocol_config(config.Pass());
+ ExpectRouteChange(kQuicChannelName);
+
ASSERT_NO_FATAL_FAILURE(
InitiateConnection(1, FakeAuthenticator::ACCEPT, false));
int counter = 2;
- ExpectRouteChange(kQuicChannelName);
EXPECT_CALL(client_channel_callback_, OnDone(_))
.WillOnce(QuitThreadOnCounter(&counter));
EXPECT_CALL(host_channel_callback_, OnDone(_))