Again disable EndToEndTest.InitialProbing on certain bots.

After changing from TEST_F to TEST_P the MAYBE_InitialProbing macro was not
expanded as expected, causing the test to be enabled on all bots with the name
MAYBE_InitialProbing.

Bug: None
Change-Id: Icfb0c4b381510c1b73295f017ebb68d43b7d9809
Reviewed-on: https://webrtc-review.googlesource.com/29640
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21074}
This commit is contained in:
philipel 2017-12-05 09:25:09 +01:00 committed by Commit Bot
parent 870921d5b8
commit b32c473770

View File

@ -62,16 +62,6 @@
#include "test/testsupport/perf_test.h"
#include "video/transport_adapter.h"
// Flaky under MemorySanitizer: bugs.webrtc.org/7419
#if defined(MEMORY_SANITIZER)
#define MAYBE_InitialProbing DISABLED_InitialProbing
// Fails on iOS bots: bugs.webrtc.org/7851
#elif defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR
#define MAYBE_InitialProbing DISABLED_InitialProbing
#else
#define MAYBE_InitialProbing InitialProbing
#endif
namespace webrtc {
namespace {
@ -2473,7 +2463,15 @@ class ProbingTest : public test::EndToEndTest {
Call* sender_call_;
};
TEST_P(EndToEndTest, MAYBE_InitialProbing) {
// Flaky under MemorySanitizer: bugs.webrtc.org/7419
// Flaky on iOS bots: bugs.webrtc.org/7851
#if defined(MEMORY_SANITIZER)
TEST_P(EndToEndTest, DISABLED_InitialProbing) {
#elif defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR
TEST_P(EndToEndTest, DISABLED_InitialProbing) {
#else
TEST_P(EndToEndTest, InitialProbing) {
#endif
class InitialProbingTest : public ProbingTest {
public:
explicit InitialProbingTest(bool* success)