From 87adb4bfa76cbada0da490e477fd0bb8cdd2a388 Mon Sep 17 00:00:00 2001 From: AlexeyBarabash Date: Wed, 11 May 2022 14:50:43 +0300 Subject: [PATCH] Disable tests which fails with TIMED OUT on Windows x86 (#13284) This commit disables these tests in Windows x86: - BraveThemeServiceTest.DarkModeChangeByRegTest - BraveSyncPrefsDeathTest.GetSeedOutNullptrCHECK - BraveSyncServiceImplDeathTest.EmulateGetOrCreateSyncCodeCHECK - ChildProcessMonitorTest.ChildCrash because they fail with TIMED OUT status in CI servers. This commit should be reverted ASAP once the real reason will be found. fixes brave/brave-browser#22767 --- .../themes/brave_theme_service_browsertest.cc | 19 +++++++++++++------ .../brave_sync/brave_sync_prefs_unittest.cc | 10 +++++++++- .../child_process_monitor_unittest.cc | 9 ++++++++- .../brave_sync_service_impl_unittest.cc | 10 +++++++++- 4 files changed, 39 insertions(+), 9 deletions(-) diff --git a/browser/themes/brave_theme_service_browsertest.cc b/browser/themes/brave_theme_service_browsertest.cc index 8468e3ca853..545be92ce9a 100644 --- a/browser/themes/brave_theme_service_browsertest.cc +++ b/browser/themes/brave_theme_service_browsertest.cc @@ -188,13 +188,20 @@ IN_PROC_BROWSER_TEST_F(BraveThemeServiceTest, OmniboxColorTest) { tp->GetColor(ThemeProperties::COLOR_OMNIBOX_RESULTS_BG)); } +// Some tests are failing for Windows x86 CI, +// See https://github.com/brave/brave-browser/issues/22767 +#if BUILDFLAG(IS_WIN) && defined(ARCH_CPU_X86) +#define MAYBE_DarkModeChangeByRegTest DISABLED_DarkModeChangeByRegTest +#else +#define MAYBE_DarkModeChangeByRegTest DarkModeChangeByRegTest +#endif #if BUILDFLAG(IS_WIN) -// Test native theme notification is called properly by changing reg value. -// This simulates dark mode setting from Windows settings. -// And Toggle it twice from initial value to go back to initial value because -// reg value changes system value. Otherwise, dark mode config could be changed -// after running this test. -IN_PROC_BROWSER_TEST_F(BraveThemeServiceTest, DarkModeChangeByRegTest) { +IN_PROC_BROWSER_TEST_F(BraveThemeServiceTest, MAYBE_DarkModeChangeByRegTest) { + // Test native theme notification is called properly by changing reg value. + // This simulates dark mode setting from Windows settings. + // And Toggle it twice from initial value to go back to initial value because + // reg value changes system value. Otherwise, dark mode config could be + // changed after running this test. if (!ui::NativeTheme::GetInstanceForNativeUi()->SystemDarkModeSupported()) return; diff --git a/components/brave_sync/brave_sync_prefs_unittest.cc b/components/brave_sync/brave_sync_prefs_unittest.cc index 3f230747e3b..6a8ed30e9ea 100644 --- a/components/brave_sync/brave_sync_prefs_unittest.cc +++ b/components/brave_sync/brave_sync_prefs_unittest.cc @@ -99,7 +99,15 @@ TEST_F(BraveSyncPrefsTest, FailedToDecryptBraveSeedValue) { } using BraveSyncPrefsDeathTest = BraveSyncPrefsTest; -TEST_F(BraveSyncPrefsDeathTest, GetSeedOutNullptrCHECK) { + +// Some tests are failing for Windows x86 CI, +// See https://github.com/brave/brave-browser/issues/22767 +#if BUILDFLAG(IS_WIN) && defined(ARCH_CPU_X86) +#define MAYBE_GetSeedOutNullptrCHECK DISABLED_GetSeedOutNullptrCHECK +#else +#define MAYBE_GetSeedOutNullptrCHECK GetSeedOutNullptrCHECK +#endif +TEST_F(BraveSyncPrefsDeathTest, MAYBE_GetSeedOutNullptrCHECK) { EXPECT_CHECK_DEATH(brave_sync_prefs()->GetSeed(nullptr)); } diff --git a/components/child_process_monitor/child_process_monitor_unittest.cc b/components/child_process_monitor/child_process_monitor_unittest.cc index e916ea8e3aa..17acaab3e55 100644 --- a/components/child_process_monitor/child_process_monitor_unittest.cc +++ b/components/child_process_monitor/child_process_monitor_unittest.cc @@ -125,7 +125,14 @@ MULTIPROCESS_TEST_MAIN(SleepyCrashChildProcess) { return 1; } -TEST_F(ChildProcessMonitorTest, ChildCrash) { +// Some tests are failing for Windows x86 CI, +// See https://github.com/brave/brave-browser/issues/22767 +#if BUILDFLAG(IS_WIN) && defined(ARCH_CPU_X86) +#define MAYBE_ChildCrash DISABLED_ChildCrash +#else +#define MAYBE_ChildCrash ChildCrash +#endif +TEST_F(ChildProcessMonitorTest, MAYBE_ChildCrash) { std::unique_ptr monitor = std::make_unique(); diff --git a/components/sync/driver/brave_sync_service_impl_unittest.cc b/components/sync/driver/brave_sync_service_impl_unittest.cc index 1229ef91e93..7eb2f247f89 100644 --- a/components/sync/driver/brave_sync_service_impl_unittest.cc +++ b/components/sync/driver/brave_sync_service_impl_unittest.cc @@ -168,7 +168,15 @@ TEST_F(BraveSyncServiceImplTest, ValidPassphraseLeadingTrailingWhitespace) { // for test suite using BraveSyncServiceImplDeathTest = BraveSyncServiceImplTest; -TEST_F(BraveSyncServiceImplDeathTest, EmulateGetOrCreateSyncCodeCHECK) { +// Some tests are failing for Windows x86 CI, +// See https://github.com/brave/brave-browser/issues/22767 +#if BUILDFLAG(IS_WIN) && defined(ARCH_CPU_X86) +#define MAYBE_EmulateGetOrCreateSyncCodeCHECK \ + DISABLED_EmulateGetOrCreateSyncCodeCHECK +#else +#define MAYBE_EmulateGetOrCreateSyncCodeCHECK EmulateGetOrCreateSyncCodeCHECK +#endif +TEST_F(BraveSyncServiceImplDeathTest, MAYBE_EmulateGetOrCreateSyncCodeCHECK) { OSCryptMocker::SetUp(); CreateSyncService(SyncServiceImpl::MANUAL_START);