diff options
| author | mihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-14 23:25:17 +0000 |
|---|---|---|
| committer | mihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-14 23:25:17 +0000 |
| commit | 4e3ce3ba829b7b0251948538ff08010c312a8ec0 (patch) | |
| tree | 191ea415ad89e6d99f27dfe72f49fc47db6750e4 /chrome/browser/extensions/extension_tabs_apitest.cc | |
| parent | 328f2ea17320817c801359ad6354c3ea5f2df294 (diff) | |
| download | chromium_src-4e3ce3ba829b7b0251948538ff08010c312a8ec0.zip chromium_src-4e3ce3ba829b7b0251948538ff08010c312a8ec0.tar.gz chromium_src-4e3ce3ba829b7b0251948538ff08010c312a8ec0.tar.bz2 | |
Fix ExtensionApiTest.TabUpdateNoPermissions timeouts
Switch testing of chrome.tabs.update with no tabs permission from an API test
to an InProcessBrowserTest that calls the extension function directly. This
should hopefully be more reliable, especially on overloaded/slow bots.
Test run times (in milliseconds):
API Test C++ Test
Normal 16-thread z600: 3809 2209
1 CPU enabled: 4036 2256
1 CPU + lookbusy -c 99 -n 2: 7342 3138
1 CPU + lookbusy -c 99 -n 4: 10705 3481
1 CPU + lookbusy -c 99 -n 8: 17830 6142
Also removes a bunch of StartTestServer() calls from other tabs API tests, since
they're not necessary (and are also causing slower run times).
BUG=98383
R=aa@chromium.org
Review URL: http://codereview.chromium.org/8274023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105609 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_tabs_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_tabs_apitest.cc | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc index 9c43c99..48cfac5 100644 --- a/chrome/browser/extensions/extension_tabs_apitest.cc +++ b/chrome/browser/extensions/extension_tabs_apitest.cc @@ -60,8 +60,6 @@ #endif IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Tabs) { - ASSERT_TRUE(StartTestServer()); - // The test creates a tab and checks that the URL of the new tab // is that of the new tab page. Make sure the pref that controls // this is set. @@ -72,60 +70,43 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Tabs) { } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Tabs2) { - ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "crud2.html")) << message_; } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabUpdate) { - ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "update.html")) << message_; } -// This times out regularly on all platforms. http://crbug.com/98383 -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_TabUpdateNoPermissions) { - ASSERT_TRUE(StartTestServer()); - ASSERT_TRUE(RunExtensionSubtest( - "tabs/no_permissions", "update.html")) << message_; -} - IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabPinned) { - ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "pinned.html")) << message_; } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabMove) { - ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "move.html")) << message_; } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabEvents) { - ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "events.html")) << message_; } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabRelativeURLs) { - ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "relative_urls.html")) << message_; } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabQuery) { - ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "query.html")) << message_; } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabHighlight) { - ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "highlight.html")) << message_; } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabCrashBrowser) { - ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "crash.html")) << message_; } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabGetCurrent) { - ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionTest("tabs/get_current")) << message_; } @@ -136,12 +117,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_TabConnect) { } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabOnRemoved) { - ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionTest("tabs/on_removed")) << message_; } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabReload) { - ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionTest("tabs/reload")) << message_; } @@ -182,7 +161,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CaptureVisibleTabPng) { #define MAYBE_CaptureVisibleTabRace DISABLED_CaptureVisibleTabRace #endif IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CaptureVisibleTabRace) { - ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab", "test_race.html")) << message_; } @@ -198,7 +176,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CaptureVisibleNoFile) { } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabsOnUpdated) { - ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionTest("tabs/on_updated")) << message_; } @@ -227,8 +204,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FocusWindowDoesNotUnmaximize) { #endif // OS_WIN IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoDisabledByPref) { - ASSERT_TRUE(StartTestServer()); - IncognitoModePrefs::SetAvailability(browser()->profile()->GetPrefs(), IncognitoModePrefs::DISABLED); @@ -238,12 +213,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoDisabledByPref) { } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_GetViewsOfCreatedPopup) { - ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_popup.html")) << message_; } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_GetViewsOfCreatedWindow) { - ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) << message_; } |