Chromium Code Reviews| Index: chrome/test/data/webui/media_router/media_router_elements_browsertest.js |
| diff --git a/chrome/test/data/webui/media_router/media_router_elements_browsertest.js b/chrome/test/data/webui/media_router/media_router_elements_browsertest.js |
| index eae673a463ab3d7c99c215b128c612e2b6b0a859..1f6fe9f3c62d010f269b3fb414c16728a0ef852f 100644 |
| --- a/chrome/test/data/webui/media_router/media_router_elements_browsertest.js |
| +++ b/chrome/test/data/webui/media_router/media_router_elements_browsertest.js |
| @@ -39,7 +39,10 @@ MediaRouterElementsBrowserTest.prototype = { |
| // media_router_container_filter_tests.js. |
| extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([ |
| 'issue_banner_tests.js', |
| - 'media_router_container_tests.js', |
| + 'media_router_container_cast_mode_list_tests.js', |
| + 'media_router_container_first_run_flow_tests.js', |
| + 'media_router_container_route_tests.js', |
| + 'media_router_container_sink_list_tests.js', |
| 'media_router_container_filter_tests.js', |
| 'media_router_header_tests.js', |
| 'media_router_search_highlighter.js', |
| @@ -84,60 +87,64 @@ MediaRouterElementsBrowserTest.prototype = { |
| TEST_F('MediaRouterElementsBrowserTest', 'MediaRouterElementsTestIssueBanner', |
| function() { |
| - // Register mocha tests for the issue banner. |
| issue_banner.registerTests(); |
| + mocha.run(); |
| +}); |
| - // Run all registered tests. |
| +// The media-router-container tests are being split into multiple parts due to |
| +// timeout issues on bots. |
| +TEST_F('MediaRouterElementsBrowserTest', |
| + 'MediaRouterElementsTestMediaRouterContainerCastModeList', |
|
apacible
2016/03/07 17:59:05
nit: Since all the tests are under "MediaRouterEle
btolsch
2016/03/07 20:20:15
Done.
|
| + function() { |
| + media_router_container_cast_mode_list.registerTests(); |
| mocha.run(); |
| }); |
| -// See bugs.chromium.org issue 591227 |
| TEST_F('MediaRouterElementsBrowserTest', |
| - 'DISABLED_MediaRouterElementsTestMediaRouterContainer', |
| + 'MediaRouterElementsTestMediaRouterContainerFirstRunFlow', |
| function() { |
| - // Register mocha tests for the container. |
| - media_router_container.registerTests(); |
| + media_router_container_first_run_flow.registerTests(); |
| + mocha.run(); |
| +}); |
| - // Run all registered tests. |
| +TEST_F('MediaRouterElementsBrowserTest', |
| + 'MediaRouterElementsTestMediaRouterContainerRoute', |
| + function() { |
| + media_router_container_route.registerTests(); |
| + mocha.run(); |
| +}); |
| + |
| +TEST_F('MediaRouterElementsBrowserTest', |
| + 'MediaRouterElementsTestMediaRouterContainerSinkList', |
| + function() { |
| + media_router_container_sink_list.registerTests(); |
| mocha.run(); |
| }); |
| TEST_F('MediaRouterElementsBrowserTest', |
| 'MediaRouterElementsTestMediaRouterContainerFilter', |
| function() { |
| - // Register mocha tests for the container filter. |
| media_router_container_filter.registerTests(); |
| - |
| - // Run all registered tests. |
| mocha.run(); |
| }); |
| TEST_F('MediaRouterElementsBrowserTest', |
| 'MediaRouterElementsTestMediaRouterHeader', |
| function() { |
| - // Register mocha tests for the header. |
| media_router_header.registerTests(); |
| - |
| - // Run all registered tests. |
| mocha.run(); |
| }); |
| TEST_F('MediaRouterElementsBrowserTest', |
| 'MediaRouterElementsTestMediaRouterSearchHighlighter', |
| function() { |
| - // Register mocha tests for the search highlighter. |
| media_router_search_highlighter.registerTests(); |
| - |
| - // Run all registered tests. |
| mocha.run(); |
| }); |
| TEST_F('MediaRouterElementsBrowserTest', |
| 'MediaRouterElementsTestMediaRouterRouteDetails', |
| function() { |
| - // Register mocha tests for the route details. |
| route_details.registerTests(); |
| - |
| - // Run all registered tests. |
| mocha.run(); |
| }); |