diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-09 23:16:19 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-09 23:16:19 +0000 |
| commit | 9db9173baebf27623ce30770696f84a3fec74259 (patch) | |
| tree | 8326c0ac249290860fadc267e46906f5250ba3de /chrome/test | |
| parent | 290887cb314a84085f40e78a8dff626a077cb259 (diff) | |
| download | chromium_src-9db9173baebf27623ce30770696f84a3fec74259.zip chromium_src-9db9173baebf27623ce30770696f84a3fec74259.tar.gz chromium_src-9db9173baebf27623ce30770696f84a3fec74259.tar.bz2 | |
Remove some obsolete FLAKY_ markers, and add some missing bug references
BUG=29020,35221,62143,62595
TEST=N/A
Review URL: http://codereview.chromium.org/4759001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65589 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/automation/automation_proxy_uitest.cc | 4 | ||||
| -rw-r--r-- | chrome/test/nacl/nacl_ui_test.cc | 2 | ||||
| -rw-r--r-- | chrome/test/ui/npapi_uitest.cc | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc index 513e83d..1e5b2cd 100644 --- a/chrome/test/automation/automation_proxy_uitest.cc +++ b/chrome/test/automation/automation_proxy_uitest.cc @@ -840,7 +840,7 @@ AutomationProxy* ExternalTabUITest::CreateAutomationProxy(int exec_timeout) { } // Create with specifying a url -// Flaky, http://crbug.com/32293. +// Flaky, http://crbug.com/32293 TEST_F(ExternalTabUITest, FLAKY_CreateExternalTab1) { scoped_refptr<TabProxy> tab; TimedMessageLoopRunner loop(MessageLoop::current()); @@ -863,6 +863,7 @@ TEST_F(ExternalTabUITest, FLAKY_CreateExternalTab1) { } // Create with empty url and then navigate +// Flaky, http://crbug.com/32293 TEST_F(ExternalTabUITest, FLAKY_CreateExternalTab2) { scoped_refptr<TabProxy> tab; TimedMessageLoopRunner loop(MessageLoop::current()); @@ -971,6 +972,7 @@ TEST_F(ExternalTabUITest, FLAKY_TabPostMessage) { loop.RunFor(action_max_timeout_ms()); } +// Flaky: http://crbug.com/62143 TEST_F(ExternalTabUITest, FLAKY_PostMessageTarget) { net::TestServer test_server( net::TestServer::TYPE_HTTP, diff --git a/chrome/test/nacl/nacl_ui_test.cc b/chrome/test/nacl/nacl_ui_test.cc index f6faf55..4104602 100644 --- a/chrome/test/nacl/nacl_ui_test.cc +++ b/chrome/test/nacl/nacl_ui_test.cc @@ -60,7 +60,7 @@ TEST_F(NaClUITest, SrpcShmTest) { RunTest(test_file, action_max_timeout_ms()); } -TEST_F(NaClUITest, FLAKY_SrpcPluginTest) { +TEST_F(NaClUITest, SrpcPluginTest) { FilePath test_file(kSrpcPluginHtmlFileName); RunTest(test_file, action_max_timeout_ms()); } diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc index 0fc336d..d20179a 100644 --- a/chrome/test/ui/npapi_uitest.cc +++ b/chrome/test/ui/npapi_uitest.cc @@ -78,10 +78,9 @@ TEST_F(NPAPITesterBase, GetJavaScriptURL) { kTestCompleteSuccess, action_max_timeout_ms()); } -// Flaky test: http://crbug.com/29020 // Test that calling GetURL with a javascript URL and target=_self // works properly when the plugin is embedded in a subframe. -TEST_F(NPAPITesterBase, FLAKY_GetJavaScriptURL2) { +TEST_F(NPAPITesterBase, GetJavaScriptURL2) { const FilePath test_case(FILE_PATH_LITERAL("get_javascript_url2.html")); GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case); ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); |