diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 19:34:39 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 19:34:39 +0000 |
| commit | 8e902a58f2d8cfe594ece7fa3dafdd21cd75add0 (patch) | |
| tree | 79c08704782479eb9bc615466650fd0d321c597e /chrome_frame/test | |
| parent | c96f3f7abe5e1bfdfffc2fa15639bd010967b4ab (diff) | |
| download | chromium_src-8e902a58f2d8cfe594ece7fa3dafdd21cd75add0.zip chromium_src-8e902a58f2d8cfe594ece7fa3dafdd21cd75add0.tar.gz chromium_src-8e902a58f2d8cfe594ece7fa3dafdd21cd75add0.tar.bz2 | |
If we fail to launch a browser during an integration test, fail the test immediately instead of waiting for stuff to timeout.
BUG=CF integration tests that fail to launch a browser take a while to timeout instead of failing quickly.
TEST-Run the integration tests on a system without Firefox installed.
Review URL: http://codereview.chromium.org/303003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29439 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
| -rw-r--r-- | chrome_frame/test/chrome_frame_unittests.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/test/chrome_frame_unittests.cc b/chrome_frame/test/chrome_frame_unittests.cc index 1675820..4b2f88b 100644 --- a/chrome_frame/test/chrome_frame_unittests.cc +++ b/chrome_frame/test/chrome_frame_unittests.cc @@ -191,7 +191,7 @@ bool ChromeFrameTestWithWebServer::CheckResultFile( void ChromeFrameTestWithWebServer::SimpleBrowserTest(BrowserKind browser, const wchar_t* page, const wchar_t* result_file_to_check) { - EXPECT_TRUE(LaunchBrowser(browser, page)); + ASSERT_TRUE(LaunchBrowser(browser, page)); ASSERT_TRUE(WaitForTestToComplete(kLongWaitTimeout)); ASSERT_TRUE(CheckResultFile(result_file_to_check, "OK")); } |