diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-15 08:33:24 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-15 08:33:24 +0000 |
| commit | 448a3db9010e3435f8218fac33f31605021652b2 (patch) | |
| tree | 2f5706c0f08deb947b49f0f0f5c55fedd6be716d /chrome/browser/extensions/execute_script_apitest.cc | |
| parent | 753245e840c7f3a996efeb9dc42d380ca15ad846 (diff) | |
| download | chromium_src-448a3db9010e3435f8218fac33f31605021652b2.zip chromium_src-448a3db9010e3435f8218fac33f31605021652b2.tar.gz chromium_src-448a3db9010e3435f8218fac33f31605021652b2.tar.bz2 | |
[GTTF] Check the result value of StartHTTPServer to avoid
test hangs in cases when the server fails to start.
The tests will still fail in that case, obviously,
but will no longer hang (or crash), which is an
improvement.
TEST=browser_tests
BUG=none
Review URL: http://codereview.chromium.org/2095004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/execute_script_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/execute_script_apitest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/execute_script_apitest.cc b/chrome/browser/extensions/execute_script_apitest.cc index 3b07add..07c141c 100644 --- a/chrome/browser/extensions/execute_script_apitest.cc +++ b/chrome/browser/extensions/execute_script_apitest.cc @@ -12,7 +12,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_ExecuteScript) { host_resolver()->AddRuleWithLatency("a.com", "127.0.0.1", 500); host_resolver()->AddRule("b.com", "127.0.0.1"); host_resolver()->AddRule("c.com", "127.0.0.1"); - StartHTTPServer(); + ASSERT_TRUE(StartHTTPServer()); ASSERT_TRUE(RunExtensionTest("executescript/basic")) << message_; ASSERT_TRUE(RunExtensionTest("executescript/in_frame")) << message_; @@ -23,7 +23,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_ExecuteScript) { // (ExecuteScript) tests are de-flakified, reunite this case with it's brethern. IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ExecuteScriptFileAfterClose) { host_resolver()->AddRule("b.com", "127.0.0.1"); - StartHTTPServer(); + ASSERT_TRUE(StartHTTPServer()); ASSERT_TRUE(RunExtensionTest("executescript/file_after_close")) << message_; } |