From 39eccefbde3f096eec57efb4ee5dbcce6528fba5 Mon Sep 17 00:00:00 2001 From: "fischman@webrtc.org" Date: Fri, 23 May 2014 17:50:38 +0000 Subject: [PATCH] Disable ChannelManagerTest.StartupShutdownOnUnstartedThread The test is testing a scenario that shouldn't happen. BUG=3388 TBR=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/21509005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6238 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/session/media/channelmanager_unittest.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/talk/session/media/channelmanager_unittest.cc b/talk/session/media/channelmanager_unittest.cc index d0d380d3eb..055e1ad1c6 100644 --- a/talk/session/media/channelmanager_unittest.cc +++ b/talk/session/media/channelmanager_unittest.cc @@ -122,7 +122,9 @@ TEST_F(ChannelManagerTest, StartupShutdownOnThread) { } // Test that we fail to startup if we're given an unstarted thread. -TEST_F(ChannelManagerTest, StartupShutdownOnUnstartedThread) { +// TODO(fischman): delete once Thread::RunningForChannelManager() is gone +// (webrtc:3388). +TEST_F(ChannelManagerTest, DISABLED_StartupShutdownOnUnstartedThread) { EXPECT_TRUE(cm_->set_worker_thread(&worker_)); EXPECT_FALSE(cm_->Init()); EXPECT_FALSE(cm_->initialized());