diff options
| author | pathorn@chromium.org <pathorn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 19:49:57 +0000 |
|---|---|---|
| committer | pathorn@chromium.org <pathorn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 19:49:57 +0000 |
| commit | d4cc2bf995ffa65ac9e28c16b6d20e40925c1f22 (patch) | |
| tree | 2e389ae395b582dfcb4a2df1f5ce090d1d550e30 | |
| parent | 8d25d04d29236b6714ea411fdba9fc2180c481d7 (diff) | |
| download | chromium_src-d4cc2bf995ffa65ac9e28c16b6d20e40925c1f22.zip chromium_src-d4cc2bf995ffa65ac9e28c16b6d20e40925c1f22.tar.gz chromium_src-d4cc2bf995ffa65ac9e28c16b6d20e40925c1f22.tar.bz2 | |
Mark StartupTests.Perf*SeveralTabs and ShutdownTests.*TwentyTabs* as flaky on mac.
BUG=46609
TEST=startup_tests don't fail on mac
Review URL: http://codereview.chromium.org/2850006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50018 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/startup/shutdown_test.cc | 17 | ||||
| -rw-r--r-- | chrome/test/startup/startup_test.cc | 21 |
2 files changed, 30 insertions, 8 deletions
diff --git a/chrome/test/startup/shutdown_test.cc b/chrome/test/startup/shutdown_test.cc index bd739fb..9f38cff2 100644 --- a/chrome/test/startup/shutdown_test.cc +++ b/chrome/test/startup/shutdown_test.cc @@ -109,13 +109,22 @@ TEST_F(ShutdownTest, SimpleSessionEnding) { true, /* important */ UITest::SESSION_ENDING); } -TEST_F(ShutdownTest, TwentyTabsWindowClose) { +// http://crbug.com/46609 +#if defined(OS_MACOSX) +#define MAYBE_TwentyTabsWindowClose FLAKY_TwentyTabsWindowClose +#define MAYBE_TwentyTabsUserQuit FLAKY_TwentyTabsUserQuit +#else +#define MAYBE_TwentyTabsWindowClose TwentyTabsWindowClose +#define MAYBE_TwentyTabsUserQuit TwentyTabsUserQuit +#endif + +TEST_F(ShutdownTest, MAYBE_TwentyTabsWindowClose) { SetUpTwentyTabs(); RunShutdownTest("shutdown", "twentytabs-window-close", true, /* important */ UITest::WINDOW_CLOSE); } -TEST_F(ShutdownTest, TwentyTabsUserQuit) { +TEST_F(ShutdownTest, MAYBE_TwentyTabsUserQuit) { SetUpTwentyTabs(); RunShutdownTest("shutdown", "twentytabs-user-quit", true, /* important */ UITest::USER_QUIT); @@ -124,9 +133,13 @@ TEST_F(ShutdownTest, TwentyTabsUserQuit) { // http://crbug.com/40671 #if defined(OS_WIN) && !defined(NDEBUG) #define MAYBE_TwentyTabsSessionEnding DISABLED_TwentyTabsSessionEnding +#elif defined(OS_MACOSX) +// http://crbug.com/46609 +#define MAYBE_TwentyTabsSessionEnding FLAKY_TwentyTabsSessionEnding #else #define MAYBE_TwentyTabsSessionEnding TwentyTabsSessionEnding #endif + TEST_F(ShutdownTest, MAYBE_TwentyTabsSessionEnding) { SetUpTwentyTabs(); RunShutdownTest("shutdown", "twentytabs-session-ending", diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc index 8536016..653cbff 100644 --- a/chrome/test/startup/startup_test.cc +++ b/chrome/test/startup/startup_test.cc @@ -202,16 +202,25 @@ TEST_F(StartupTest, PerfFewTabs) { RunPerfTestWithManyTabs("few_tabs", 5, false); } -TEST_F(StartupTest, PerfSeveralTabs) { - RunPerfTestWithManyTabs("several_tabs", 20, false); -} - TEST_F(StartupTest, PerfRestoreFewTabs) { RunPerfTestWithManyTabs("restore_few_tabs", 5, true); } -TEST_F(StartupTest, PerfRestoreSeveralTabs) { - RunPerfTestWithManyTabs("restore_several_tabs", 20, true); +// http://crbug.com/46609 +#if defined(OS_MACOSX) +#define MAYBE_PerfSeveralTabs FLAKY_PerfSeveralTabs +#define MAYBE_PerfRestoreSeveralTabs FLAKY_PerfRestoreSeveralTabs +#else +#define MAYBE_PerfSeveralTabs PerfSeveralTabs +#define MAYBE_PerfRestoreSeveralTabs PerfRestoreSeveralTabs +#endif + +TEST_F(StartupTest, MAYBE_PerfSeveralTabs) { + RunPerfTestWithManyTabs("several_tabs", 10, false); +} + +TEST_F(StartupTest, MAYBE_PerfRestoreSeveralTabs) { + RunPerfTestWithManyTabs("restore_several_tabs", 10, true); } TEST_F(StartupTest, PerfExtensionEmpty) { |