Commit 8700ed14 authored by Yves Gerey's avatar Yves Gerey Committed by Commit Bot

Revert "Disable all WebRtcBrowserTests on ASan"

This reverts commit 6d582d18.

Reason for revert: The leaks are not caused by WebRTC code,
                   but merely revealed by the tests.
We re-enable those tests: either the leaks have been fixed, or we'll add
a suppression (less drastic than muting the whole WebRTC test suite).

Original change's description:
>Disable all WebRtcBrowserTests on ASan
>
>Many of these tests flakily leak and thus fail on ASan bots.
>
>TBR=phoglund@chromium.org
>
>Bug: 898546
>Change-Id: Icd3cc5dc3a46d0194c807c27b66f7eb902b35794
>Reviewed-on: https://chromium-review.googlesource.com/c/1299161
>Reviewed-by: Marc Treib <treib@chromium.org>
>Commit-Queue: Marc Treib <treib@chromium.org>
>Cr-Commit-Position: refs/heads/master@{#602745}

Bug: chromium:898546
Change-Id: Idccff7827e6381e20060f7116cac75ee2b25018f
Reviewed-on: https://chromium-review.googlesource.com/c/1337626Reviewed-by: default avatarPatrik Höglund <phoglund@chromium.org>
Commit-Queue: Yves Gerey <yvesg@google.com>
Cr-Commit-Position: refs/heads/master@{#608366}
parent 67e449b9
...@@ -33,19 +33,12 @@ static const char kKeygenAlgorithmRsa[] = ...@@ -33,19 +33,12 @@ static const char kKeygenAlgorithmRsa[] =
static const char kKeygenAlgorithmEcdsa[] = static const char kKeygenAlgorithmEcdsa[] =
"{ name: \"ECDSA\", namedCurve: \"P-256\" }"; "{ name: \"ECDSA\", namedCurve: \"P-256\" }";
// TODO(crbug.com/898546): Many WebRtcBrowserTests flakily leak.
#if defined(ADDRESS_SANITIZER)
#define MAYBE_WebRtcBrowserTest DISABLED_WebRtcBrowserTest
#else
#define MAYBE_WebRtcBrowserTest WebRtcBrowserTest
#endif
// Top-level integration test for WebRTC. It always uses fake devices; see // Top-level integration test for WebRTC. It always uses fake devices; see
// WebRtcWebcamBrowserTest for a test that acquires any real webcam on the // WebRtcWebcamBrowserTest for a test that acquires any real webcam on the
// system. // system.
class MAYBE_WebRtcBrowserTest : public WebRtcTestBase { class WebRtcBrowserTest : public WebRtcTestBase {
public: public:
MAYBE_WebRtcBrowserTest() : left_tab_(nullptr), right_tab_(nullptr) {} WebRtcBrowserTest() : left_tab_(nullptr), right_tab_(nullptr) {}
void SetUpInProcessBrowserTestFixture() override { void SetUpInProcessBrowserTestFixture() override {
DetectErrorsInJavaScript(); // Look for errors in our rather complex js. DetectErrorsInJavaScript(); // Look for errors in our rather complex js.
...@@ -129,19 +122,19 @@ class MAYBE_WebRtcBrowserTest : public WebRtcTestBase { ...@@ -129,19 +122,19 @@ class MAYBE_WebRtcBrowserTest : public WebRtcTestBase {
content::WebContents* right_tab_; content::WebContents* right_tab_;
}; };
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
RunsAudioVideoWebRTCCallInTwoTabsVP8) { RunsAudioVideoWebRTCCallInTwoTabsVP8) {
RunsAudioVideoWebRTCCallInTwoTabs("VP8"); RunsAudioVideoWebRTCCallInTwoTabs("VP8");
} }
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
RunsAudioVideoWebRTCCallInTwoTabsVP9) { RunsAudioVideoWebRTCCallInTwoTabsVP9) {
RunsAudioVideoWebRTCCallInTwoTabs("VP9"); RunsAudioVideoWebRTCCallInTwoTabs("VP9");
} }
#if BUILDFLAG(RTC_USE_H264) #if BUILDFLAG(RTC_USE_H264)
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
RunsAudioVideoWebRTCCallInTwoTabsH264) { RunsAudioVideoWebRTCCallInTwoTabsH264) {
// Only run test if run-time feature corresponding to |rtc_use_h264| is on. // Only run test if run-time feature corresponding to |rtc_use_h264| is on.
if (!base::FeatureList::IsEnabled(content::kWebRtcH264WithOpenH264FFmpeg)) { if (!base::FeatureList::IsEnabled(content::kWebRtcH264WithOpenH264FFmpeg)) {
...@@ -164,7 +157,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, ...@@ -164,7 +157,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest,
#endif // BUILDFLAG(RTC_USE_H264) #endif // BUILDFLAG(RTC_USE_H264)
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, TestWebAudioMediaStream) { IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, TestWebAudioMediaStream) {
// This tests against crash regressions for the WebAudio-MediaStream // This tests against crash regressions for the WebAudio-MediaStream
// integration. // integration.
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
...@@ -179,14 +172,14 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, TestWebAudioMediaStream) { ...@@ -179,14 +172,14 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, TestWebAudioMediaStream) {
ASSERT_FALSE(tab->IsCrashed()); ASSERT_FALSE(tab->IsCrashed());
} }
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
RunsAudioVideoWebRTCCallInTwoTabsOfferRsaAnswerRsa) { RunsAudioVideoWebRTCCallInTwoTabsOfferRsaAnswerRsa) {
RunsAudioVideoWebRTCCallInTwoTabs(WebRtcTestBase::kUseDefaultVideoCodec, RunsAudioVideoWebRTCCallInTwoTabs(WebRtcTestBase::kUseDefaultVideoCodec,
false /* prefer_hw_video_codec */, false /* prefer_hw_video_codec */,
kKeygenAlgorithmRsa, kKeygenAlgorithmRsa); kKeygenAlgorithmRsa, kKeygenAlgorithmRsa);
} }
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
RunsAudioVideoWebRTCCallInTwoTabsOfferEcdsaAnswerEcdsa) { RunsAudioVideoWebRTCCallInTwoTabsOfferEcdsaAnswerEcdsa) {
RunsAudioVideoWebRTCCallInTwoTabs( RunsAudioVideoWebRTCCallInTwoTabs(
WebRtcTestBase::kUseDefaultVideoCodec, false /* prefer_hw_video_codec */, WebRtcTestBase::kUseDefaultVideoCodec, false /* prefer_hw_video_codec */,
...@@ -194,32 +187,32 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, ...@@ -194,32 +187,32 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest,
} }
IN_PROC_BROWSER_TEST_F( IN_PROC_BROWSER_TEST_F(
MAYBE_WebRtcBrowserTest, WebRtcBrowserTest,
RunsAudioVideoWebRTCCallInTwoTabsWithClonedCertificateRsa) { RunsAudioVideoWebRTCCallInTwoTabsWithClonedCertificateRsa) {
RunsAudioVideoWebRTCCallInTwoTabsWithClonedCertificate(kKeygenAlgorithmRsa); RunsAudioVideoWebRTCCallInTwoTabsWithClonedCertificate(kKeygenAlgorithmRsa);
} }
IN_PROC_BROWSER_TEST_F( IN_PROC_BROWSER_TEST_F(
MAYBE_WebRtcBrowserTest, WebRtcBrowserTest,
RunsAudioVideoWebRTCCallInTwoTabsWithClonedCertificateEcdsa) { RunsAudioVideoWebRTCCallInTwoTabsWithClonedCertificateEcdsa) {
RunsAudioVideoWebRTCCallInTwoTabsWithClonedCertificate(kKeygenAlgorithmEcdsa); RunsAudioVideoWebRTCCallInTwoTabsWithClonedCertificate(kKeygenAlgorithmEcdsa);
} }
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
RunsAudioVideoWebRTCCallInTwoTabsOfferRsaAnswerEcdsa) { RunsAudioVideoWebRTCCallInTwoTabsOfferRsaAnswerEcdsa) {
RunsAudioVideoWebRTCCallInTwoTabs(WebRtcTestBase::kUseDefaultVideoCodec, RunsAudioVideoWebRTCCallInTwoTabs(WebRtcTestBase::kUseDefaultVideoCodec,
false /* prefer_hw_video_codec */, false /* prefer_hw_video_codec */,
kKeygenAlgorithmRsa, kKeygenAlgorithmEcdsa); kKeygenAlgorithmRsa, kKeygenAlgorithmEcdsa);
} }
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
RunsAudioVideoWebRTCCallInTwoTabsOfferEcdsaAnswerRsa) { RunsAudioVideoWebRTCCallInTwoTabsOfferEcdsaAnswerRsa) {
RunsAudioVideoWebRTCCallInTwoTabs(WebRtcTestBase::kUseDefaultVideoCodec, RunsAudioVideoWebRTCCallInTwoTabs(WebRtcTestBase::kUseDefaultVideoCodec,
false /* prefer_hw_video_codec */, false /* prefer_hw_video_codec */,
kKeygenAlgorithmEcdsa, kKeygenAlgorithmRsa); kKeygenAlgorithmEcdsa, kKeygenAlgorithmRsa);
} }
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
RunsAudioVideoWebRTCCallInTwoTabsGetStatsCallback) { RunsAudioVideoWebRTCCallInTwoTabsGetStatsCallback) {
StartServerAndOpenTabs(); StartServerAndOpenTabs();
SetupPeerconnectionWithLocalStream(left_tab_); SetupPeerconnectionWithLocalStream(left_tab_);
...@@ -238,7 +231,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, ...@@ -238,7 +231,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest,
#define MAYBE_RunsAudioVideoWebRTCCallInTwoTabsGetStatsPromise \ #define MAYBE_RunsAudioVideoWebRTCCallInTwoTabsGetStatsPromise \
RunsAudioVideoWebRTCCallInTwoTabsGetStatsPromise RunsAudioVideoWebRTCCallInTwoTabsGetStatsPromise
#endif #endif
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
MAYBE_RunsAudioVideoWebRTCCallInTwoTabsGetStatsPromise) { MAYBE_RunsAudioVideoWebRTCCallInTwoTabsGetStatsPromise) {
StartServerAndOpenTabs(); StartServerAndOpenTabs();
SetupPeerconnectionWithLocalStream(left_tab_); SetupPeerconnectionWithLocalStream(left_tab_);
...@@ -262,7 +255,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, ...@@ -262,7 +255,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest,
} }
IN_PROC_BROWSER_TEST_F( IN_PROC_BROWSER_TEST_F(
MAYBE_WebRtcBrowserTest, WebRtcBrowserTest,
RunsAudioVideoWebRTCCallInTwoTabsEmitsGatheringStateChange) { RunsAudioVideoWebRTCCallInTwoTabsEmitsGatheringStateChange) {
StartServerAndOpenTabs(); StartServerAndOpenTabs();
SetupPeerconnectionWithLocalStream(left_tab_); SetupPeerconnectionWithLocalStream(left_tab_);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment