diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-23 17:20:15 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-23 17:20:15 +0000 |
commit | de22b85fb9a1b01e57cbac2497d17afa322a3166 (patch) | |
tree | e269e11c858828675c9bf6c8533a14f0c5bf33be | |
parent | a2582f4408a5417460577acb8b49c4a2d8bfba3c (diff) | |
download | chromium_src-de22b85fb9a1b01e57cbac2497d17afa322a3166.zip chromium_src-de22b85fb9a1b01e57cbac2497d17afa322a3166.tar.gz chromium_src-de22b85fb9a1b01e57cbac2497d17afa322a3166.tar.bz2 |
Disable all the tests that are flaking more than 5% on Windows builders.
Data from http://chromium-build-logs.appspot.com/flakiness_dashboard?master=chromium.win.
BUG=386891,387124,396373,396384,396386,396387,396388,396390,396392,387124,396393,396395,396399,396402,396403,396404,396405,393149,396409,95557,396413,396414,375894
R=viettrungluu@chromium.org
TBR=brettw, rvargas, sky
Review URL: https://codereview.chromium.org/410843003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284977 0039d316-1c4b-4281-b951-d872f2087c98
17 files changed, 184 insertions, 54 deletions
diff --git a/base/debug/trace_event_unittest.cc b/base/debug/trace_event_unittest.cc index 3f41706..6092141 100644 --- a/base/debug/trace_event_unittest.cc +++ b/base/debug/trace_event_unittest.cc @@ -2415,7 +2415,13 @@ TEST_F(TraceEventCallbackTest, TraceEventCallbackAndRecordingDuration) { VerifyCollectedEvent(5, TRACE_EVENT_PHASE_END, "callback", "duration1"); } -TEST_F(TraceEventTestFixture, TraceBufferVectorReportFull) { +#if defined(OS_WIN) +// http://crbug.com/396403 +#define MAYBE_TraceBufferVectorReportFull DISABLED_TraceBufferVectorReportFull +#else +#define MAYBE_TraceBufferVectorReportFull TraceBufferVectorReportFull +#endif +TEST_F(TraceEventTestFixture, MAYBE_TraceBufferVectorReportFull) { TraceLog* trace_log = TraceLog::GetInstance(); trace_log->SetEnabled(CategoryFilter("*"), base::debug::TraceLog::RECORDING_MODE, diff --git a/base/time/time_win_unittest.cc b/base/time/time_win_unittest.cc index ca4b7e3..46e256e 100644 --- a/base/time/time_win_unittest.cc +++ b/base/time/time_win_unittest.cc @@ -210,7 +210,8 @@ TEST(TimeTicks, TimerPerformance) { } } -TEST(TimeTicks, Drift) { +// http://crbug.com/396384 +TEST(TimeTicks, DISABLED_Drift) { // If QPC is disabled, this isn't measuring anything. if (!TimeTicks::IsHighResClockWorking()) return; diff --git a/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc b/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc index b15c499..31ef787 100644 --- a/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc +++ b/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc @@ -295,18 +295,13 @@ class CastStreamingApiTestWithPixelOutput : public CastStreamingApiTest { } }; -// http://crbug.com/177163 -#if defined(OS_WIN) && !defined(NDEBUG) -#define MAYBE_EndToEnd DISABLED_TabsApi -#else -#define MAYBE_EndToEnd EndToEnd -#endif // defined(OS_WIN) && !defined(NDEBUG) +// http://crbug.com/396413 // Tests the Cast streaming API and its basic functionality end-to-end. An // extension subtest is run to generate test content, capture that content, and // use the API to send it out. At the same time, this test launches an // in-process Cast receiver, listening on a localhost UDP socket, to receive the // content and check whether it matches expectations. -IN_PROC_BROWSER_TEST_F(CastStreamingApiTestWithPixelOutput, MAYBE_EndToEnd) { +IN_PROC_BROWSER_TEST_F(CastStreamingApiTestWithPixelOutput, DISABLED_EndToEnd) { scoped_ptr<net::UDPSocket> receive_socket( new net::UDPSocket(net::DatagramSocket::DEFAULT_BIND, net::RandIntCallback(), diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc index ad63c62..198d650 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc @@ -715,7 +715,14 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, CheckDownloadUrlRedirects) { EXPECT_EQ(SB_THREAT_TYPE_BINARY_MALWARE_URL, client->GetThreatType()); } -IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, CheckDownloadUrlTimedOut) { +#if defined(OS_WIN) +// http://crbug.com/396409 +#define MAYBE_CheckDownloadUrlTimedOut DISABLED_CheckDownloadUrlTimedOut +#else +#define MAYBE_CheckDownloadUrlTimedOut CheckDownloadUrlTimedOut +#endif +IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, + MAYBE_CheckDownloadUrlTimedOut) { GURL badbin_url = test_server()->GetURL(kMalwareFile); std::vector<GURL> badbin_urls(1, badbin_url); diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc index 4dc3706..ad24b0f 100644 --- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc @@ -310,7 +310,13 @@ TEST_F(ProfileSyncServiceStartupTest, DISABLED_StartInvalidCredentials) { EXPECT_TRUE(sync_->ShouldPushChanges()); } -TEST_F(ProfileSyncServiceStartupCrosTest, StartCrosNoCredentials) { +#if defined(OS_WIN) +// http://crbug.com/396402 +#define MAYBE_StartCrosNoCredentials DISABLED_StartCrosNoCredentials +#else +#define MAYBE_StartCrosNoCredentials StartCrosNoCredentials +#endif +TEST_F(ProfileSyncServiceStartupCrosTest, MAYBE_StartCrosNoCredentials) { EXPECT_CALL(*components_factory_mock(), CreateDataTypeManager(_, _, _, _, _, _)).Times(0); EXPECT_CALL(*components_factory_mock(), @@ -342,7 +348,13 @@ TEST_F(ProfileSyncServiceStartupCrosTest, StartFirstTime) { EXPECT_TRUE(sync_->ShouldPushChanges()); } -TEST_F(ProfileSyncServiceStartupTest, StartNormal) { +#if defined(OS_WIN) +// http://crbug.com/396402 +#define MAYBE_StartNormal DISABLED_StartNormal +#else +#define MAYBE_StartNormal StartNormal +#endif +TEST_F(ProfileSyncServiceStartupTest, MAYBE_StartNormal) { // Pre load the tokens profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername, "test_user@gmail.com"); @@ -401,7 +413,13 @@ TEST_F(ProfileSyncServiceStartupTest, StartRecoverDatatypePrefs) { // Verify that the recovery of datatype preferences doesn't overwrite a valid // case where only bookmarks are enabled. -TEST_F(ProfileSyncServiceStartupTest, StartDontRecoverDatatypePrefs) { +#if defined(OS_WIN) +// http://crbug.com/396402 +#define MAYBE_StartDontRecoverDatatypePrefs DISABLED_StartDontRecoverDatatypePrefs +#else +#define MAYBE_StartDontRecoverDatatypePrefs StartDontRecoverDatatypePrefs +#endif +TEST_F(ProfileSyncServiceStartupTest, MAYBE_StartDontRecoverDatatypePrefs) { // Explicitly set Keep Everything Synced to false and have only bookmarks // enabled. profile_->GetPrefs()->SetBoolean( @@ -428,7 +446,13 @@ TEST_F(ProfileSyncServiceStartupTest, StartDontRecoverDatatypePrefs) { sync_driver::prefs::kSyncKeepEverythingSynced)); } -TEST_F(ProfileSyncServiceStartupTest, ManagedStartup) { +#if defined(OS_WIN) +// http://crbug.com/396402 +#define MAYBE_ManagedStartup DISABLED_ManagedStartup +#else +#define MAYBE_ManagedStartup ManagedStartup +#endif +TEST_F(ProfileSyncServiceStartupTest, MAYBE_ManagedStartup) { // Service should not be started by Initialize() since it's managed. profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername, "test_user@gmail.com"); diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc index cf7da82..c0fcc66 100644 --- a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc @@ -949,7 +949,13 @@ TEST_F(DriveBackendSyncTest, ReorganizeToUnmanagedArea) { EXPECT_EQ(4u, CountTracker()); } -TEST_F(DriveBackendSyncTest, ReorganizeToMultipleParents) { +#if defined(OS_WIN) +// http://crbug.com/396388 +#define MAYBE_ReorganizeToMultipleParents DISABLED_ReorganizeToMultipleParents +#else +#define MAYBE_ReorganizeToMultipleParents ReorganizeToMultipleParents +#endif +TEST_F(DriveBackendSyncTest, MAYBE_ReorganizeToMultipleParents) { std::string app_id = "example"; RegisterApp(app_id); @@ -1024,8 +1030,13 @@ TEST_F(DriveBackendSyncTest, ReorganizeAndRevert) { EXPECT_EQ(5u, CountMetadata()); EXPECT_EQ(5u, CountTracker()); } - -TEST_F(DriveBackendSyncTest, ConflictTest_AddFolder_AddFolder) { +#if defined(OS_WIN) +// http://crbug.com/396388 +#define MAYBE_ConflictTest_ConflictTest_AddFolder_AddFolder DISABLED_ConflictTest_ConflictTest_AddFolder_AddFolder +#else +#define MAYBE_ConflictTest_ConflictTest_AddFolder_AddFolder ConflictTest_ConflictTest_AddFolder_AddFolder +#endif +TEST_F(DriveBackendSyncTest, MAYBE_ConflictTest_ConflictTest_AddFolder_AddFolder) { std::string app_id = "example"; RegisterApp(app_id); @@ -1097,7 +1108,13 @@ TEST_F(DriveBackendSyncTest, ConflictTest_AddFolder_DeleteFolder) { EXPECT_EQ(3u, CountTracker()); } -TEST_F(DriveBackendSyncTest, ConflictTest_AddFolder_AddFile) { +#if defined(OS_WIN) +// http://crbug.com/396388 +#define MAYBE_ConflictTest_AddFolder_AddFile DISABLED_ConflictTest_AddFolder_AddFile +#else +#define MAYBE_ConflictTest_AddFolder_AddFile ConflictTest_AddFolder_AddFile +#endif +TEST_F(DriveBackendSyncTest, MAYBE_ConflictTest_AddFolder_AddFile) { std::string app_id = "example"; RegisterApp(app_id); @@ -1321,7 +1338,13 @@ TEST_F(DriveBackendSyncTest, ConflictTest_DeleteFolder_DeleteFile) { EXPECT_EQ(2u, CountTracker()); } -TEST_F(DriveBackendSyncTest, ConflictTest_AddFile_AddFolder) { +#if defined(OS_WIN) +// http://crbug.com/396388 +#define MAYBE_ConflictTest_AddFile_AddFolder DISABLED_ConflictTest_AddFile_AddFolder +#else +#define MAYBE_ConflictTest_AddFile_AddFolder ConflictTest_AddFile_AddFolder +#endif +TEST_F(DriveBackendSyncTest, MAYBE_ConflictTest_AddFile_AddFolder) { std::string app_id = "example"; RegisterApp(app_id); @@ -1403,7 +1426,13 @@ TEST_F(DriveBackendSyncTest, ConflictTest_AddFile_DeleteFolder) { EXPECT_EQ(4u, CountTracker()); } -TEST_F(DriveBackendSyncTest, ConflictTest_AddFile_AddFile) { +#if defined(OS_WIN) +// http://crbug.com/396388 +#define MAYBE_ConflictTest_AddFile_AddFile DISABLED_ConflictTest_AddFile_AddFile +#else +#define MAYBE_ConflictTest_AddFile_AddFile ConflictTest_AddFile_AddFile +#endif +TEST_F(DriveBackendSyncTest, MAYBE_ConflictTest_AddFile_AddFile) { std::string app_id = "example"; RegisterApp(app_id); diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc index 8809d62..6a5dc67 100644 --- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc +++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc @@ -169,7 +169,8 @@ class ProfileSigninConfirmationHelperTest : public testing::Test { #endif }; -TEST_F(ProfileSigninConfirmationHelperTest, DoNotPromptForNewProfile) { +// http://crbug.com/393149 +TEST_F(ProfileSigninConfirmationHelperTest, DISABLED_DoNotPromptForNewProfile) { // Profile is new and there's no profile data. EXPECT_FALSE( GetCallbackResult( @@ -217,7 +218,9 @@ TEST_F(ProfileSigninConfirmationHelperTest, PromptForNewProfile_Extensions) { base::Bind(&ui::CheckShouldPromptForNewProfile, profile_.get()))); } -TEST_F(ProfileSigninConfirmationHelperTest, PromptForNewProfile_History) { +// http://crbug.com/393149 +TEST_F(ProfileSigninConfirmationHelperTest, + DISABLED_PromptForNewProfile_History) { HistoryService* history = HistoryServiceFactory::GetForProfile( profile_.get(), Profile::EXPLICIT_ACCESS); @@ -240,7 +243,9 @@ TEST_F(ProfileSigninConfirmationHelperTest, PromptForNewProfile_History) { profile_.get()))); } -TEST_F(ProfileSigninConfirmationHelperTest, PromptForNewProfile_TypedURLs) { +// http://crbug.com/393149 +TEST_F(ProfileSigninConfirmationHelperTest, + DISABLED_PromptForNewProfile_TypedURLs) { HistoryService* history = HistoryServiceFactory::GetForProfile( profile_.get(), Profile::EXPLICIT_ACCESS); diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc index f73a653..5f97d26 100644 --- a/chrome/common/service_process_util_unittest.cc +++ b/chrome/common/service_process_util_unittest.cc @@ -108,7 +108,8 @@ TEST_F(ServiceProcessStateTest, Singleton) { LaunchAndWait("ServiceProcessStateTestSingleton"); } -TEST_F(ServiceProcessStateTest, ReadyState) { +// http://crbug.com/396390 +TEST_F(ServiceProcessStateTest, DISABLED_ReadyState) { ASSERT_FALSE(CheckServiceProcessReady()); ServiceProcessState state; ASSERT_TRUE(state.Initialize()); @@ -167,7 +168,8 @@ TEST_F(ServiceProcessStateTest, AutoRun) { #endif // defined(OS_WIN) } -TEST_F(ServiceProcessStateTest, SharedMem) { +// http://crbug.com/396390 +TEST_F(ServiceProcessStateTest, DISABLED_SharedMem) { std::string version; base::ProcessId pid; #if defined(OS_WIN) diff --git a/chrome/installer/util/work_item_list_unittest.cc b/chrome/installer/util/work_item_list_unittest.cc index 0671994..857987f 100644 --- a/chrome/installer/util/work_item_list_unittest.cc +++ b/chrome/installer/util/work_item_list_unittest.cc @@ -51,7 +51,8 @@ class WorkItemListTest : public testing::Test { } // namespace // Execute a WorkItem list successfully and then rollback. -TEST_F(WorkItemListTest, ExecutionSuccess) { +// http://crbug.com/396405 +TEST_F(WorkItemListTest, DISABLED_ExecutionSuccess) { scoped_ptr<WorkItemList> work_item_list(WorkItem::CreateWorkItemList()); scoped_ptr<WorkItem> work_item; @@ -232,7 +233,8 @@ TEST_F(WorkItemListTest, ConditionalExecutionSuccess) { EXPECT_FALSE(base::PathExists(top_dir_to_create)); } -TEST_F(WorkItemListTest, ConditionalExecutionConditionFailure) { +// http://crbug.com/396405 +TEST_F(WorkItemListTest, DISABLED_ConditionalExecutionConditionFailure) { scoped_ptr<WorkItemList> work_item_list(WorkItem::CreateWorkItemList()); scoped_ptr<WorkItem> work_item; diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc index 377640d..d95cc36 100644 --- a/chrome/test/nacl/nacl_browsertest.cc +++ b/chrome/test/nacl/nacl_browsertest.cc @@ -444,13 +444,8 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStderrPM, RedirectBg1) { } // TODO(ncbray) support glibc and PNaCl -#if defined(OS_MACOSX) -// crbug.com/375894 -#define MAYBE_MimeHandler DISABLED_MimeHandler -#else -#define MAYBE_MimeHandler MimeHandler -#endif -IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MAYBE_MimeHandler) { +// flaky: crbug.com/375894 +IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { RunNaClIntegrationTest(FILE_PATH_LITERAL( "ppapi_extension_mime_handler.html")); } diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc index 307d645..9f3187e 100644 --- a/chrome/test/ppapi/ppapi_browsertest.cc +++ b/chrome/test/ppapi/ppapi_browsertest.cc @@ -612,7 +612,13 @@ TEST_PPAPI_NACL(VarResource) #undef PostMessage #endif -IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, PostMessage) { +#if defined(OS_WIN) +// http://crbug.com/95557 +#define MAYBE_PostMessage DISABLED_PostMessage +#else +#define MAYBE_PostMessage PostMessage +#endif +IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_PostMessage) { RUN_POSTMESSAGE_SUBTESTS; } IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, PostMessage) { @@ -1001,29 +1007,35 @@ IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_WebSocket1) { IN_PROC_BROWSER_TEST_F(PPAPITest, MAYBE_WebSocket2) { RUN_WEBSOCKET_SUBTESTS_2; } +#if !defined(OS_WIN) // http://crbug.com/396399 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_WebSocket1) { RUN_WEBSOCKET_SUBTESTS_1; } -IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_WebSocket2) { - RUN_WEBSOCKET_SUBTESTS_2; -} IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket1) { RUN_WEBSOCKET_SUBTESTS_1; } -IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket2) { - RUN_WEBSOCKET_SUBTESTS_2; -} IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket1)) { RUN_WEBSOCKET_SUBTESTS_1; } -#if !defined(OS_WIN) // http://crbug.com/396363 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket2)) { RUN_WEBSOCKET_SUBTESTS_2; } -#endif IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, WebSocket1) { RUN_WEBSOCKET_SUBTESTS_1; } +#endif +IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_WebSocket2) { + RUN_WEBSOCKET_SUBTESTS_2; +} + +IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket2) { + RUN_WEBSOCKET_SUBTESTS_2; +} + +IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(WebSocket2)) { + RUN_WEBSOCKET_SUBTESTS_2; +} + // Flaky on XP Tests (3): http://crbug.com/389084 #if defined(OS_WIN) #define MAYBE_WebSocket2 DISABLED_WebSocket2 @@ -1269,7 +1281,8 @@ IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FlashMessageLoop) { TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor0, RUN_COMPOSITOR_SUBTESTS_0) TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor1, RUN_COMPOSITOR_SUBTESTS_1) -TEST_PPAPI_NACL(MediaStreamAudioTrack) +// http://crbug.com/396395 +TEST_PPAPI_NACL(DISABLED_MediaStreamAudioTrack) TEST_PPAPI_NACL(MediaStreamVideoTrack) diff --git a/content/browser/plugin_browsertest.cc b/content/browser/plugin_browsertest.cc index 223b724..d2c66fd 100644 --- a/content/browser/plugin_browsertest.cc +++ b/content/browser/plugin_browsertest.cc @@ -354,6 +354,7 @@ IN_PROC_BROWSER_TEST_F(PluginTest, PluginSingleRangeRequest) { LoadAndWait(GetURL("plugin_single_range_request.html")); } +#if !defined(OS_WIN) // http://crbug.com/396373 // Test checking the privacy mode is on. // If this flakes on Linux, use http://crbug.com/104380 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(PrivateEnabled)) { @@ -361,14 +362,15 @@ IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(PrivateEnabled)) { url = GURL(url.spec() + "?private"); LoadAndWaitInWindow(CreateOffTheRecordBrowser(), url); } +#endif -#if defined(OS_WIN) || defined(OS_MACOSX) +// These used to run on Windows: http://crbug.com/396373 +#if defined(OS_MACOSX) // Test a browser hang due to special case of multiple // plugin instances indulged in sync calls across renderer. IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(MultipleInstancesSyncCalls)) { LoadAndWait(GetURL("multiple_instances_sync_calls.html")); } -#endif IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(GetURLRequestFailWrite)) { GURL url(URLRequestMockHTTPJob::GetMockUrl( @@ -376,6 +378,7 @@ IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(GetURLRequestFailWrite)) { AppendASCII("plugin_url_request_fail_write.html"))); LoadAndWait(url); } +#endif #if defined(OS_WIN) // Flaky on Windows x86. http://crbug.com/388245 diff --git a/content/browser/speech/speech_recognition_browsertest.cc b/content/browser/speech/speech_recognition_browsertest.cc index 5871aa1..0f84793 100644 --- a/content/browser/speech/speech_recognition_browsertest.cc +++ b/content/browser/speech/speech_recognition_browsertest.cc @@ -188,7 +188,13 @@ class SpeechRecognitionBrowserTest : // Simply loads the test page and checks if it was able to create a Speech // Recognition object in JavaScript, to make sure the Web Speech API is enabled. -IN_PROC_BROWSER_TEST_F(SpeechRecognitionBrowserTest, Precheck) { +// http://crbug.com/396414 +#if defined(OS_WIN) +#define MAYBE_Precheck DISABLED_Precheck +#else +#define MAYBE_Precheck Precheck +#endif +IN_PROC_BROWSER_TEST_F(SpeechRecognitionBrowserTest, MAYBE_Precheck) { NavigateToURLBlockUntilNavigationsComplete( shell(), GetTestUrlFromFragment("precheck"), 2); diff --git a/mojo/system/message_pipe_dispatcher_unittest.cc b/mojo/system/message_pipe_dispatcher_unittest.cc index 73cbc54..95f5bf8 100644 --- a/mojo/system/message_pipe_dispatcher_unittest.cc +++ b/mojo/system/message_pipe_dispatcher_unittest.cc @@ -258,7 +258,13 @@ TEST(MessagePipeDispatcherTest, BasicClosed) { } } -TEST(MessagePipeDispatcherTest, BasicThreaded) { +#if defined(OS_WIN) +// http://crbug.com/396386 +#define MAYBE_BasicThreaded DISABLED_BasicThreaded +#else +#define MAYBE_BasicThreaded BasicThreaded +#endif +TEST(MessagePipeDispatcherTest, MAYBE_BasicThreaded) { test::Stopwatch stopwatch; int32_t buffer[1]; const uint32_t kBufferSize = static_cast<uint32_t>(sizeof(buffer)); diff --git a/mojo/system/simple_dispatcher_unittest.cc b/mojo/system/simple_dispatcher_unittest.cc index 83692b7..648cab9 100644 --- a/mojo/system/simple_dispatcher_unittest.cc +++ b/mojo/system/simple_dispatcher_unittest.cc @@ -87,7 +87,13 @@ class MockSimpleDispatcher : public SimpleDispatcher { DISALLOW_COPY_AND_ASSIGN(MockSimpleDispatcher); }; -TEST(SimpleDispatcherTest, Basic) { +#if defined(OS_WIN) +// http://crbug.com/396404 +#define MAYBE_Basic DISABLED_Basic +#else +#define MAYBE_Basic Basic +#endif +TEST(SimpleDispatcherTest, MAYBE_Basic) { test::Stopwatch stopwatch; scoped_refptr<MockSimpleDispatcher> d(new MockSimpleDispatcher()); @@ -268,7 +274,13 @@ TEST(SimpleDispatcherTest, BasicClosed) { // Don't need to remove waiters from closed dispatchers. } -TEST(SimpleDispatcherTest, BasicThreaded) { +#if defined(OS_WIN) +// http://crbug.com/396393 +#define MAYBE_BasicThreaded DISABLED_BasicThreaded +#else +#define MAYBE_BasicThreaded BasicThreaded +#endif +TEST(SimpleDispatcherTest, MAYBE_BasicThreaded) { test::Stopwatch stopwatch; bool did_wait; MojoResult result; @@ -381,7 +393,13 @@ TEST(SimpleDispatcherTest, BasicThreaded) { EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, result); } -TEST(SimpleDispatcherTest, MultipleWaiters) { +#if defined(OS_WIN) +// http://crbug.com/387124 +#define MAYBE_MultipleWaiters DISABLED_MultipleWaiters +#else +#define MAYBE_MultipleWaiters MultipleWaiters +#endif +TEST(SimpleDispatcherTest, MAYBE_MultipleWaiters) { static const uint32_t kNumWaiters = 20; bool did_wait[kNumWaiters]; diff --git a/net/disk_cache/backend_unittest.cc b/net/disk_cache/backend_unittest.cc index f9df5bd..1302e3b 100644 --- a/net/disk_cache/backend_unittest.cc +++ b/net/disk_cache/backend_unittest.cc @@ -1783,11 +1783,23 @@ void DiskCacheBackendTest::BackendRecoverRemove() { ASSERT_TRUE(success_) << "remove_head4"; } -TEST_F(DiskCacheBackendTest, RecoverRemove) { +#if defined(OS_WIN) +// http://crbug.com/396392 +#define MAYBE_RecoverRemove DISABLED_RecoverRemove +#else +#define MAYBE_RecoverRemove RecoverRemove +#endif +TEST_F(DiskCacheBackendTest, MAYBE_RecoverRemove) { BackendRecoverRemove(); } -TEST_F(DiskCacheBackendTest, NewEvictionRecoverRemove) { +#if defined(OS_WIN) +// http://crbug.com/396392 +#define MAYBE_NewEvictionRecoverRemove DISABLED_NewEvictionRecoverRemove +#else +#define MAYBE_NewEvictionRecoverRemove NewEvictionRecoverRemove +#endif +TEST_F(DiskCacheBackendTest, MAYBE_NewEvictionRecoverRemove) { SetNewEviction(); BackendRecoverRemove(); } diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc index 37cf5ed..d398eb2 100644 --- a/ui/aura/window_unittest.cc +++ b/ui/aura/window_unittest.cc @@ -874,7 +874,13 @@ TEST_F(WindowTest, TouchCaptureCancelsOtherTouches) { EXPECT_EQ(0, delegate2.touch_event_count()); } -TEST_F(WindowTest, TouchCaptureDoesntCancelCapturedTouches) { +#if defined(OS_WIN) +// http://crbug.com/396387 +#define MAYBE_TouchCaptureDoesntCancelCapturedTouches DISABLED_TouchCaptureDoesntCancelCapturedTouches +#else +#define MAYBE_TouchCaptureDoesntCancelCapturedTouches TouchCaptureDoesntCancelCapturedTouches +#endif +TEST_F(WindowTest, MAYBE_TouchCaptureDoesntCancelCapturedTouches) { CaptureWindowDelegateImpl delegate; scoped_ptr<Window> window(CreateTestWindowWithDelegate( &delegate, 0, gfx::Rect(0, 0, 50, 50), root_window())); |