diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-16 20:36:09 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-16 20:36:09 +0000 |
| commit | d23ca37c840cfd3b43a23d3e3e122f0674608935 (patch) | |
| tree | ce19b5f4ba3f949f8e9d862e3741d611cc2746c1 /chrome_frame/test/test_with_web_server.cc | |
| parent | b75ee4f2d216e0970348b0f0698b7867efaf14b9 (diff) | |
| download | chromium_src-d23ca37c840cfd3b43a23d3e3e122f0674608935.zip chromium_src-d23ca37c840cfd3b43a23d3e3e122f0674608935.tar.gz chromium_src-d23ca37c840cfd3b43a23d3e3e122f0674608935.tar.bz2 | |
Fix cfinstance chrome tests. Before they were either failing to launch
chrome (if chrome itself wasn't installed) or launching the installed chrome
and not the one from the build directory.
TEST=Run *WidgetModeChrome_* unit tests.
BUG=35868
Review URL: http://codereview.chromium.org/606066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39132 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/test_with_web_server.cc')
| -rw-r--r-- | chrome_frame/test/test_with_web_server.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc index 7f39e41..56acce1 100644 --- a/chrome_frame/test/test_with_web_server.cc +++ b/chrome_frame/test/test_with_web_server.cc @@ -176,6 +176,7 @@ void ChromeFrameTestWithWebServer::SimpleBrowserTest(BrowserKind browser, void ChromeFrameTestWithWebServer::OptionalBrowserTest(BrowserKind browser, const wchar_t* page, const wchar_t* result_file_to_check) { + DCHECK(browser != CHROME) << "Chrome tests shouldn't be optional"; if (!LaunchBrowser(browser, page)) { LOG(ERROR) << "Failed to launch browser " << ToString(browser); } else { @@ -456,7 +457,7 @@ TEST_F(ChromeFrameTestWithWebServer, } TEST_F(ChromeFrameTestWithWebServer, WidgetModeChrome_CFInstanceIfrPost) { - OptionalBrowserTest(CHROME, kCFIIfrPostPage, L"CFInstanceIfrPost"); + SimpleBrowserTest(CHROME, kCFIIfrPostPage, L"CFInstanceIfrPost"); } TEST_F(ChromeFrameTestWithWebServer, WidgetModeSafari_CFInstanceIfrPost) { @@ -480,7 +481,7 @@ TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeFF_CFInstancePost) { } TEST_F(ChromeFrameTestWithWebServer, WidgetModeChrome_CFInstancePost) { - OptionalBrowserTest(CHROME, kCFIPostPage, L"CFInstancePost"); + SimpleBrowserTest(CHROME, kCFIPostPage, L"CFInstancePost"); } TEST_F(ChromeFrameTestWithWebServer, WidgetModeSafari_CFInstancePost) { @@ -504,7 +505,7 @@ TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeFF_CFInstanceRPC) { } TEST_F(ChromeFrameTestWithWebServer, WidgetModeChrome_CFInstanceRPC) { - OptionalBrowserTest(CHROME, kCFIRPCPage, L"CFInstanceRPC"); + SimpleBrowserTest(CHROME, kCFIRPCPage, L"CFInstanceRPC"); } TEST_F(ChromeFrameTestWithWebServer, WidgetModeSafari_CFInstanceRPC) { @@ -527,7 +528,7 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_CFInstanceRPCInternal) { } TEST_F(ChromeFrameTestWithWebServer, WidgetModeChrome_CFInstanceRPCInternal) { - OptionalBrowserTest(CHROME, kCFIRPCInternalPage, L"CFInstanceRPCInternal"); + SimpleBrowserTest(CHROME, kCFIRPCInternalPage, L"CFInstanceRPCInternal"); } TEST_F(ChromeFrameTestWithWebServer, WidgetModeSafari_CFInstanceRPCInternal) { |