summaryrefslogtreecommitdiffstats
path: root/remoting/protocol
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-02 08:27:54 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-02 08:27:54 +0000
commit8cc008da31b478fae3031b190bb4d84d9592a63b (patch)
tree3e12ddcc452e4f4da7db5c1c1773e624a0a2e71f /remoting/protocol
parentcf703f8392428c9b66865ca805afeab4aa0b92b7 (diff)
downloadchromium_src-8cc008da31b478fae3031b190bb4d84d9592a63b.zip
chromium_src-8cc008da31b478fae3031b190bb4d84d9592a63b.tar.gz
chromium_src-8cc008da31b478fae3031b190bb4d84d9592a63b.tar.bz2
Disable JingleSessionTest.Connect, JingleSessionTest.TestControlChannel
Those tests flakily trigger a libjingle assertion: Error(common.cc:67): e:\b\build\slave\win\build\src\third_party\libjingle\source\talk\session\tunnel\pseudotcpchannel.cc(281): ASSERT FAILED: stream_ != NULL && stream_thread_->IsCurrent() @ cricket::PseudoTcpChannel::Close TBR=hclam BUG=70225 TEST=remoting_unittests Review URL: http://codereview.chromium.org/6334046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73436 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
-rw-r--r--remoting/protocol/jingle_session_unittest.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc
index 8da6eff..99e500f 100644
--- a/remoting/protocol/jingle_session_unittest.cc
+++ b/remoting/protocol/jingle_session_unittest.cc
@@ -586,13 +586,15 @@ TEST_F(JingleSessionTest, RejectConnection) {
}
// Verify that we can connect two endpoints.
-TEST_F(JingleSessionTest, Connect) {
+// Disabled, http://crbug.com/70225.
+TEST_F(JingleSessionTest, DISABLED_Connect) {
CreateServerPair();
ASSERT_TRUE(InitiateConnection());
}
// Verify that data can be transmitted over the event channel.
-TEST_F(JingleSessionTest, TestControlChannel) {
+// Disabled, http://crbug.com/70225.
+TEST_F(JingleSessionTest, DISABLED_TestControlChannel) {
CreateServerPair();
ASSERT_TRUE(InitiateConnection());
scoped_refptr<TCPChannelTester> tester(