Fix ExecuteScriptApiTest.NavigationRace flakiness.
The test only appeared to time out when running two tests per test case. It
does not when splitting up the execute_script and javascript_url subtests
into two test cases. No other tests run two extension tests per test case
either.
[email protected]
BUG=78802
TEST=no
Review URL: http://codereview.chromium.org/7104078
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88464 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/execute_script_apitest.cc b/chrome/browser/extensions/execute_script_apitest.cc
index 12d84ec..76926bdd 100644
--- a/chrome/browser/extensions/execute_script_apitest.cc
+++ b/chrome/browser/extensions/execute_script_apitest.cc
@@ -55,18 +55,18 @@
ASSERT_TRUE(RunExtensionTest(extension_name)) << message_;
}
-#if defined(OS_LINUX) || defined(OS_MACOSX)
-// 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) {
+IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, NavigationRaceExecuteScript) {
host_resolver()->AddRule("a.com", "127.0.0.1");
host_resolver()->AddRule("b.com", "127.0.0.1");
ASSERT_TRUE(StartTestServer());
ASSERT_TRUE(RunExtensionSubtest("executescript/navigation_race",
"execute_script.html")) << message_;
+}
+
+IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, NavigationRaceJavaScriptUrl) {
+ host_resolver()->AddRule("a.com", "127.0.0.1");
+ host_resolver()->AddRule("b.com", "127.0.0.1");
+ ASSERT_TRUE(StartTestServer());
ASSERT_TRUE(RunExtensionSubtest("executescript/navigation_race",
"javascript_url.html")) << message_;
}
