diff options
| author | alekseys@chromium.org <alekseys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-09 23:00:26 +0000 |
|---|---|---|
| committer | alekseys@chromium.org <alekseys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-09 23:00:26 +0000 |
| commit | 97f7290396855cd1771d445b102e7a370013cdf0 (patch) | |
| tree | f35ee43efd484a8e0ac6f2df4c80d65dc9450a17 /chrome/browser/sidebar | |
| parent | 5469a777480a8c4a7acc1f60f6f3d92190e030f4 (diff) | |
| download | chromium_src-97f7290396855cd1771d445b102e7a370013cdf0.zip chromium_src-97f7290396855cd1771d445b102e7a370013cdf0.tar.gz chromium_src-97f7290396855cd1771d445b102e7a370013cdf0.tar.bz2 | |
interactive_ui_tests, SidebarTest.SidebarNavigate test fixed:
- test HTTP server was never started, starting it now;
- added missing test resource, simple_page.html;
BUG=57964
TEST=interactive_ui_tests, SidebarTest.SidebarNavigate should not hang
Review URL: http://codereview.chromium.org/5736001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68782 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sidebar')
| -rw-r--r-- | chrome/browser/sidebar/sidebar_test.cc | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/chrome/browser/sidebar/sidebar_test.cc b/chrome/browser/sidebar/sidebar_test.cc index eb83630..e567791 100644 --- a/chrome/browser/sidebar/sidebar_test.cc +++ b/chrome/browser/sidebar/sidebar_test.cc @@ -44,9 +44,7 @@ class SidebarTest : public InProcessBrowserTest { } void NavigateSidebarForCurrentTabTo(const std::string& test_page) { - net::TestServer* server = test_server(); - ASSERT_TRUE(server); - GURL url = server->GetURL(test_page); + GURL url = test_server()->GetURL(test_page); TabContents* tab = browser()->GetSelectedTabContents(); @@ -165,13 +163,9 @@ IN_PROC_BROWSER_TEST_F(SidebarTest, SidebarOnInactiveTab) { HideSidebarForCurrentTab(); } -// FAILS, http://crbug.com/57964 -#if defined(OS_WIN) -#define MAYBE_SidebarNavigate DISABLED_SidebarNavigate -#else -#define MAYBE_SidebarNavigate SidebarNavigate -#endif -IN_PROC_BROWSER_TEST_F(SidebarTest, MAYBE_SidebarNavigate) { +IN_PROC_BROWSER_TEST_F(SidebarTest, SidebarNavigate) { + ASSERT_TRUE(test_server()->Start()); + ShowSidebarForCurrentTab(); NavigateSidebarForCurrentTabTo(kSimplePage); |