From 50bc5538525960d4a5346dbc6c4669e258eea28e Mon Sep 17 00:00:00 2001 From: "mallinath@webrtc.org" Date: Mon, 21 Oct 2013 17:58:35 +0000 Subject: [PATCH] Reenable DTLS renegotiation unittest in libjingle. This test is failing on memcheck bots. After investigation problem per say is not in this particular unittest and rather is in suite. So this test is added to memcheck exclude list. R=wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2689004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5011 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/app/webrtc/peerconnection_unittest.cc | 2 +- .../libjingle_peerconnection_unittest.gtest-memcheck.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/talk/app/webrtc/peerconnection_unittest.cc b/talk/app/webrtc/peerconnection_unittest.cc index 74f420b0db..9de6ec94a7 100644 --- a/talk/app/webrtc/peerconnection_unittest.cc +++ b/talk/app/webrtc/peerconnection_unittest.cc @@ -1065,7 +1065,7 @@ TEST_F(JsepPeerConnectionP2PTestClient, LocalP2PTestDtls) { // This test sets up a audio call initially and then upgrades to audio/video, // using DTLS. -TEST_F(JsepPeerConnectionP2PTestClient, DISABLED_LocalP2PTestDtlsRenegotiate) { +TEST_F(JsepPeerConnectionP2PTestClient, LocalP2PTestDtlsRenegotiate) { MAYBE_SKIP_TEST(talk_base::SSLStreamAdapter::HaveDtlsSrtp); FakeConstraints setup_constraints; setup_constraints.AddMandatory(MediaConstraintsInterface::kEnableDtlsSrtp, diff --git a/tools/valgrind-webrtc/gtest_exclude/libjingle_peerconnection_unittest.gtest-memcheck.txt b/tools/valgrind-webrtc/gtest_exclude/libjingle_peerconnection_unittest.gtest-memcheck.txt index b6f59dae0f..4d99d0f461 100644 --- a/tools/valgrind-webrtc/gtest_exclude/libjingle_peerconnection_unittest.gtest-memcheck.txt +++ b/tools/valgrind-webrtc/gtest_exclude/libjingle_peerconnection_unittest.gtest-memcheck.txt @@ -12,6 +12,7 @@ JsepPeerConnectionP2PTestClient.LocalP2PTestAnswerVideo JsepPeerConnectionP2PTestClient.LocalP2PTest16To9 JsepPeerConnectionP2PTestClient.LocalP2PTestDataChannel JsepPeerConnectionP2PTestClient.LocalP2PTestDtls +JsepPeerConnectionP2PTestClient.LocalP2PTestDtlsRenegotiate JsepPeerConnectionP2PTestClient.LocalP2PTestDtmf JsepPeerConnectionP2PTestClient.LocalP2PTestReceiverDoesntSupportData JsepPeerConnectionP2PTestClient.LocalP2PTestOfferDtlsButNotSdes