summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_session_unittest.cc
diff options
context:
space:
mode:
authorcbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-10 16:48:04 +0000
committercbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-10 16:48:04 +0000
commit3264fc3cf0162e1d2302b31afc55c8c3d7aef71d (patch)
treeff04ab8ef005d2e160c47d5fc67a6cda12c684b1 /net/spdy/spdy_session_unittest.cc
parent85632fab9c8f30b4651f06fd75e1ba5881226e6c (diff)
downloadchromium_src-3264fc3cf0162e1d2302b31afc55c8c3d7aef71d.zip
chromium_src-3264fc3cf0162e1d2302b31afc55c8c3d7aef71d.tar.gz
chromium_src-3264fc3cf0162e1d2302b31afc55c8c3d7aef71d.tar.bz2
Fix valgrind memcheck issues with GetPushStream unit test.
BUG=None TEST=valgrind --leak-check=yes net_unittests --gtest_filter="*SpdySessionTest.GetPushStream*" Review URL: http://codereview.chromium.org/1951001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46823 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_session_unittest.cc')
-rw-r--r--net/spdy/spdy_session_unittest.cc12
1 files changed, 11 insertions, 1 deletions
diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc
index 603c269..980311a 100644
--- a/net/spdy/spdy_session_unittest.cc
+++ b/net/spdy/spdy_session_unittest.cc
@@ -172,7 +172,7 @@ static const uint8 kPush[] = {
} // namespace
-TEST_F(SpdySessionTest, DISABLED_GetPushStream) {
+TEST_F(SpdySessionTest, GetPushStream) {
SpdySessionTest::TurnOffCompression();
SessionDependencies session_deps;
@@ -230,6 +230,16 @@ TEST_F(SpdySessionTest, DISABLED_GetPushStream) {
EXPECT_EQ(test_push_path, second_stream->path());
EXPECT_EQ(2U, second_stream->stream_id());
EXPECT_EQ(0, second_stream->priority());
+
+ // Clean up
+ second_stream = NULL;
+ session = NULL;
+ spdy_session_pool->CloseAllSessions();
+
+ // RunAllPending needs to be called here because the
+ // ClientSocketPoolBase posts a task to clean up and destroy the
+ // underlying socket.
+ MessageLoop::current()->RunAllPending();
}
} // namespace net