diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-10 23:55:02 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-10 23:55:02 +0000 |
| commit | 27d53738b9d4b67757a231a32565c5d8e1745d77 (patch) | |
| tree | d6010563d7901895235355e9bc71918e4ca835b5 /chrome/browser/extensions | |
| parent | 5b5e9decf0d61c5c8ffb4c8e549c8b0a450c6629 (diff) | |
| download | chromium_src-27d53738b9d4b67757a231a32565c5d8e1745d77.zip chromium_src-27d53738b9d4b67757a231a32565c5d8e1745d77.tar.gz chromium_src-27d53738b9d4b67757a231a32565c5d8e1745d77.tar.bz2 | |
Mark ExtensionsLoadTest.Test as flaky on Win/Mac
BUG=46301
TEST=greener tree
TBR=jcivelli
Review URL: http://codereview.chromium.org/2727007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49472 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/extension_startup_browsertest.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc index 309b055..cf4adc4 100644 --- a/chrome/browser/extensions/extension_startup_browsertest.cc +++ b/chrome/browser/extensions/extension_startup_browsertest.cc @@ -138,7 +138,7 @@ class ExtensionsStartupTest : public ExtensionStartupTestBase { } }; -IN_PROC_BROWSER_TEST_F(ExtensionsStartupTest, Test) { +IN_PROC_BROWSER_TEST_F(ExtensionsStartupTest, MAYBE_Test) { WaitForServicesToStart(4, true); // 1 component extension and 3 others. TestInjection(true, true); } @@ -160,7 +160,13 @@ class ExtensionsLoadTest : public ExtensionStartupTestBase { } }; -IN_PROC_BROWSER_TEST_F(ExtensionsLoadTest, Test) { +// Flaky (times out) on Mac/Windows. http://crbug.com/46301. +#if defined(OS_MAC) || defined(OS_WIN) +#define MAYBE_Test FLAKY_Test +#else +#define MAYBE_Test Test +#endif +IN_PROC_BROWSER_TEST_F(ExtensionsLoadTest, MAYBE_Test) { WaitForServicesToStart(1, false); TestInjection(true, true); } |