diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 19:49:20 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 19:49:20 +0000 |
| commit | d5c7dc99efbbd0934aaae33c7e67ac4cf3403fd0 (patch) | |
| tree | 8100460c76d005c20963fc44906dd1cbf8029a11 /chrome/browser | |
| parent | f996127f7ab589f8ad42776f6dc0684a3ccd6c83 (diff) | |
| download | chromium_src-d5c7dc99efbbd0934aaae33c7e67ac4cf3403fd0.zip chromium_src-d5c7dc99efbbd0934aaae33c7e67ac4cf3403fd0.tar.gz chromium_src-d5c7dc99efbbd0934aaae33c7e67ac4cf3403fd0.tar.bz2 | |
This is a temp hack to get SSLUITest.TestHTTPErrorWithNoNavEntry working on linux/views.
see http://crbug/28098 for more details about the root cause of the issue.
BUG=28098
TEST=brower_tests passes with this hack, but we need real solution.
Review URL: http://codereview.chromium.org/397037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32381 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/ssl/ssl_browser_tests.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index 974a2c5..1266be8 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -249,11 +249,16 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSErrorWithNoNavEntry) { EXPECT_EQ(2, browser()->tab_count()); EXPECT_EQ(1, browser()->selected_index()); + // TODO(jcampan|oshima): Following code waits forever on linux/views + // because LOAD_STOP notification is issued before WaitLorLoadStop + // is called. See http://crbug/28098. +#if !defined(OS_LINUX) || !defined(TOOLKIT_VIEWS) // Since the navigation was initiated by the renderer (when we clicked on the // link) and since the main page network request failed, we won't get a // navigation entry committed. So we'll just wait for the load to stop. ui_test_utils::WaitForLoadStop( &(browser()->GetSelectedTabContents()->controller())); +#endif // We should have an interstitial page showing. ASSERT_TRUE(browser()->GetSelectedTabContents()->interstitial_page()); |