Disable some EncryptedMediaTests

content/browser/media/encrypted_media_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/string_util.h"
@@ skipping 97 matching lines @@
 #endif
     command_line->AppendSwitchNative(switches::kRegisterPepperPlugins,
                                      pepper_plugin);
   }
 };
 
 INSTANTIATE_TEST_CASE_P(ClearKey, EncryptedMediaTest,
                         ::testing::Values(kClearKeyKeySystem));
 
 INSTANTIATE_TEST_CASE_P(ExternalClearKey, EncryptedMediaTest,
                         ::testing::Values(kExternalClearKeyKeySystem));

[shadi, 2013/02/05 18:44:28]

Is not easier to just disable adding this parametrized test for
defined(OS_LINUX) && !defined(NDEBUG), rather than adding it for each test case
below? 

[vabr (Chromium), 2013/02/05 18:52:14]

Well, there was still FrameChangeVideo which did not seem to be affected in the
same way as the others, and I did not want to disable that.

 
 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, InvalidKeySystem) {
   const string16 kExpected = ASCIIToUTF16(
       StringToUpperASCII(std::string("GenerateKeyRequestException")));
   ASSERT_NO_FATAL_FAILURE(
       TestSimplePlayback("bear-320x240-av-enc_av.webm", kWebMAudioVideo,
                          "com.example.invalid", kExpected));
 }
 
+#if defined(OS_LINUX) && !defined(NDEBUG)
+// http://crbug.com/174294; not using MAYBE_ because IN_PROC_BROWSER_TEST_P does
+// not expand the test name macro correctly, TODO(vabr, bauerb)

[Bernhard Bauer, 2013/02/05 16:21:52]

The correct format for TODOs is `TODO(ldap):`

(Picking nits here because having a standardized format allows grepping for
TODOs.)

Also, see https://codereview.chromium.org/12209016.

+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_BasicPlayback_AudioOnly) {
+#else
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_AudioOnly) {
+#endif
   const string16 kExpected = ASCIIToUTF16("ENDED");
   ASSERT_NO_FATAL_FAILURE(
       TestSimplePlayback("bear-a-enc_a.webm", kWebMAudioOnly,
                          GetParam(), kExpected));
 }
 
+#if defined(OS_LINUX) && !defined(NDEBUG)
+// http://crbug.com/174294; not using MAYBE_ because IN_PROC_BROWSER_TEST_P does
+// not expand the test name macro correctly, TODO(vabr, bauerb)
+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest,
+                       DISABLED_BasicPlayback_AudioClearVideo) {
+#else
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_AudioClearVideo) {
+#endif
   const string16 kExpected = ASCIIToUTF16("ENDED");
   ASSERT_NO_FATAL_FAILURE(
       TestSimplePlayback("bear-320x240-av-enc_a.webm", kWebMAudioVideo,
                          GetParam(), kExpected));
 }
 
+#if defined(OS_LINUX) && !defined(NDEBUG)
+// http://crbug.com/174294; not using MAYBE_ because IN_PROC_BROWSER_TEST_P does
+// not expand the test name macro correctly, TODO(vabr, bauerb)
+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_BasicPlayback_VideoAudio) {
+#else
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_VideoAudio) {
+#endif
   const string16 kExpected = ASCIIToUTF16("ENDED");
   ASSERT_NO_FATAL_FAILURE(
       TestSimplePlayback("bear-320x240-av-enc_av.webm", kWebMAudioVideo,
                          GetParam(), kExpected));
 }
 
+#if defined(OS_LINUX) && !defined(NDEBUG)
+// http://crbug.com/174294; not using MAYBE_ because IN_PROC_BROWSER_TEST_P does
+// not expand the test name macro correctly, TODO(vabr, bauerb)
+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_BasicPlayback_VideoOnly) {
+#else
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_VideoOnly) {
+#endif
   const string16 kExpected = ASCIIToUTF16("ENDED");
   ASSERT_NO_FATAL_FAILURE(
       TestSimplePlayback("bear-320x240-v-enc_v.webm", kWebMVideoOnly,
                          GetParam(), kExpected));
 }
 
+#if defined(OS_LINUX) && !defined(NDEBUG)
+// http://crbug.com/174294; not using MAYBE_ because IN_PROC_BROWSER_TEST_P does
+// not expand the test name macro correctly, TODO(vabr, bauerb)
+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest,
+                       DISABLED_BasicPlayback_VideoClearAudio) {
+#else
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_VideoClearAudio) {
+#endif
   const string16 kExpected = ASCIIToUTF16("ENDED");
   ASSERT_NO_FATAL_FAILURE(
       TestSimplePlayback("bear-320x240-av-enc_v.webm", kWebMAudioVideo,
                          GetParam(), kExpected));
 }
 
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameChangeVideo) {
   const string16 kExpected = ASCIIToUTF16("ENDED");
   ASSERT_NO_FATAL_FAILURE(TestFrameSizeChange(GetParam(), kExpected));
 }
 
 }  // namespace content