diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 18:53:49 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 18:53:49 +0000 |
| commit | a344b767d2a25a64e99320f70e8db05229e77e9c (patch) | |
| tree | 32e4353a31fd80d42f3634cf3e82db2265a54560 /chrome/browser/extensions/app_process_apitest.cc | |
| parent | 3a8f9d5592f5780ab122f187a62569da36d6a639 (diff) | |
| download | chromium_src-a344b767d2a25a64e99320f70e8db05229e77e9c.zip chromium_src-a344b767d2a25a64e99320f70e8db05229e77e9c.tar.gz chromium_src-a344b767d2a25a64e99320f70e8db05229e77e9c.tar.bz2 | |
Disable AppApiTest.ReloadAppAfterCrash on Mac and Linux due to flaky timeouts.
TBR=mihaip
BUG=118502
TEST=no
Review URL: https://chromiumcodereview.appspot.com/9705077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127214 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/app_process_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/app_process_apitest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index 561dc70..fea468a 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -634,7 +634,13 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, OpenWebPopupFromWebIframe) { EXPECT_EQ(process, popup_process); } -IN_PROC_BROWSER_TEST_F(AppApiTest, ReloadAppAfterCrash) { +// http://crbug.com/118502 +#if defined(OS_MACOSX) || defined(OS_LINUX) +#define MAYBE_ReloadAppAfterCrash DISABLED_ReloadAppAfterCrash +#else +#define MAYBE_ReloadAppAfterCrash ReloadAppAfterCrash +#endif +IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadAppAfterCrash) { extensions::ProcessMap* process_map = browser()->profile()->GetExtensionService()->process_map(); |