diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-29 23:48:13 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-29 23:48:13 +0000 |
| commit | effa399e47e7095faa32f6815494b01f02b2e0e7 (patch) | |
| tree | de6786b1b97f741c54884084b600dd9e3465752f /chrome_frame | |
| parent | 100bb60280152445092e6c167a65d708f1cd40be (diff) | |
| download | chromium_src-effa399e47e7095faa32f6815494b01f02b2e0e7.zip chromium_src-effa399e47e7095faa32f6815494b01f02b2e0e7.tar.gz chromium_src-effa399e47e7095faa32f6815494b01f02b2e0e7.tar.bz2 | |
Disabling the ChromeFrame test ProxyFactoryTest.FastCreateDestroy as it crashes
randomly. Increased the timeout of the ContextMenu.CFInspector CF test to see if this fixes
the flakiness with this test.
BUG=81039
TBR=amit
Review URL: http://codereview.chromium.org/6883285
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83628 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/proxy_factory_mock.cc | 4 | ||||
| -rw-r--r-- | chrome_frame/test/ui_test.cc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome_frame/test/proxy_factory_mock.cc b/chrome_frame/test/proxy_factory_mock.cc index 20c56fe..e8f8ba7 100644 --- a/chrome_frame/test/proxy_factory_mock.cc +++ b/chrome_frame/test/proxy_factory_mock.cc @@ -91,7 +91,9 @@ TEST(ProxyFactoryTest, CreateDifferentProfiles) { f.ReleaseAutomationServer(i1, &d); } -TEST(ProxyFactoryTest, FastCreateDestroy) { +// This test has been disabled because it crashes randomly on the builders. +// http://code.google.com/p/chromium/issues/detail?id=81039 +TEST(ProxyFactoryTest, DISABLED_FastCreateDestroy) { CrashMetricsReporter::GetInstance()->set_active(true); ProxyFactory f; LaunchDelegateMock* d1 = new LaunchDelegateMock(); diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc index 5c1c45a..171897a 100644 --- a/chrome_frame/test/ui_test.cc +++ b/chrome_frame/test/ui_test.cc @@ -548,7 +548,7 @@ TEST_F(ContextMenuTest, CFInspector) { .WillOnce(CloseBrowserMock(&ie_mock_)); LaunchIENavigateAndLoop(GetSimplePageUrl(), - kChromeFrameLongNavigationTimeoutInSeconds * 2); + kChromeFrameVeryLongNavigationTimeoutInSeconds); } TEST_F(ContextMenuTest, CFSavePageAs) { |