diff options
| author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-08 09:44:23 +0000 |
|---|---|---|
| committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-08 09:44:23 +0000 |
| commit | 075e8e5e944ad91696e50ff8663333a7ee294af3 (patch) | |
| tree | efefbb5daa124ca670273f1961c468036e13c352 /chrome/browser/extensions/execute_script_apitest.cc | |
| parent | cff60116c532356d3e48d21de2d64f42b5da797a (diff) | |
| download | chromium_src-075e8e5e944ad91696e50ff8663333a7ee294af3.zip chromium_src-075e8e5e944ad91696e50ff8663333a7ee294af3.tar.gz chromium_src-075e8e5e944ad91696e50ff8663333a7ee294af3.tar.bz2 | |
Disable ExecuteScriptApiTest.NavigationRace on Linux
BUG=78802
TEST=greener tree
Review URL: http://codereview.chromium.org/6812049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80915 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 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/extensions/execute_script_apitest.cc b/chrome/browser/extensions/execute_script_apitest.cc index c12a4e0..b3110ee 100644 --- a/chrome/browser/extensions/execute_script_apitest.cc +++ b/chrome/browser/extensions/execute_script_apitest.cc @@ -47,7 +47,13 @@ IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ASSERT_TRUE(RunExtensionTest(extension_name)) << message_; } -IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, NavigationRace) { +#if defined(OS_LINUX) +// Flakily times out: http://crbug.com/78802 +#define MAYBE_NavigationRace DISABLED_NavigationRace +#else +#define MAYBE_NavigationRace NavigationRace +#endif +IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, MAYBE_NavigationRace) { host_resolver()->AddRule("a.com", "127.0.0.1"); host_resolver()->AddRule("b.com", "127.0.0.1"); ASSERT_TRUE(StartTestServer()); |