summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-22 00:13:11 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-22 00:13:11 +0000
commitf2870a91d57f0af4e5dc4315e451b6fd00cff42d (patch)
tree99448b8838e18fefe7ab4b247d381c078a5bc83d
parentaf4acda6cc24136f95d9ab99841b759a71687c2f (diff)
downloadchromium_src-f2870a91d57f0af4e5dc4315e451b6fd00cff42d.zip
chromium_src-f2870a91d57f0af4e5dc4315e451b6fd00cff42d.tar.gz
chromium_src-f2870a91d57f0af4e5dc4315e451b6fd00cff42d.tar.bz2
Remove flaky from a test that has been de-flaked in several ways (see bug 57405).
Update bug numbers in two places, so that each has a distinct bug with owners that are involved in the area and each of those bug depends on the underlying bug. TEST=SearchProviderTest.TestIsSearchProviderInstalled BUG=57405,60043,60035 Review URL: http://codereview.chromium.org/3985002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63453 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/renderer/external_extension_uitest.cc5
-rw-r--r--chrome/test/test_launcher_utils.cc2
2 files changed, 3 insertions, 4 deletions
diff --git a/chrome/renderer/external_extension_uitest.cc b/chrome/renderer/external_extension_uitest.cc
index e391954..d58066f 100644
--- a/chrome/renderer/external_extension_uitest.cc
+++ b/chrome/renderer/external_extension_uitest.cc
@@ -112,8 +112,7 @@ void SearchProviderTest::FinishIsSearchProviderInstalledTest(
EXPECT_STREQ("1\n", value.c_str());
}
-// Flaky, http://crbug.com/57405.
-TEST_F(SearchProviderTest, FLAKY_TestIsSearchProviderInstalled) {
+TEST_F(SearchProviderTest, TestIsSearchProviderInstalled) {
ASSERT_TRUE(test_server_.Start());
// Use the default search provider, other installed search provider, and
@@ -150,7 +149,7 @@ TEST_F(SearchProviderTest, FLAKY_TestIsSearchProviderInstalled) {
}
// The following should be re-enabled. At the moment, there are problems with
- // doing all of these queries in parallel -- see http://crbug.com/57491.
+ // doing all of these queries in parallel -- see http://crbug.com/60043.
#if 0
// Remove the calls to FinishIsSearchProviderInstalledTest above when
// re-enabling this code.
diff --git a/chrome/test/test_launcher_utils.cc b/chrome/test/test_launcher_utils.cc
index fe71bb1..59328e2 100644
--- a/chrome/test/test_launcher_utils.cc
+++ b/chrome/test/test_launcher_utils.cc
@@ -17,7 +17,7 @@ void PrepareBrowserCommandLineForTests(CommandLine* command_line) {
command_line->AppendSwitch(switches::kDisableWebResources);
// Turn off preconnects because they break the brittle python webserver;
- // see http://crbug.com/57491.
+ // see http://crbug.com/60035.
command_line->AppendSwitch(switches::kDisablePreconnect);
// Don't show the first run ui.