[Media Router] Further split media_router_container tests.

chrome/test/data/webui/media_router/media_router_elements_browsertest.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /** @fileoverview Runs the Media Router Polymer elements tests. */
 
 /** @const {string} Path to source root. */
 var ROOT_PATH = '../../../../../';
 
 // Polymer BrowserTest fixture.
@@ skipping 21 matching lines @@
 
   commandLineSwitches: [{
     switchName: 'media-router', switchValue: '1'
   }],
 
   // List tests for individual elements. The media_router_container tests are
   // split between media_router_container_tests.js and
   // media_router_container_filter_tests.js.
   extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
     'issue_banner_tests.js',
-    'media_router_container_tests.js',
+    'media_router_container_part_one_tests.js',
+    'media_router_container_part_two_tests.js',
     'media_router_container_filter_tests.js',
     'media_router_header_tests.js',
     'media_router_search_highlighter.js',
     'route_details_tests.js',
   ]),
 
   /** @override */
   setUp: function() {
     PolymerTest.prototype.setUp.call(this);
 
@@ skipping 24 matching lines @@
 
     // Enable when warning is resolved.
     // AX_TEXT_04: http://crbug.com/591554
     this.accessibilityAuditConfig.ignoreSelectors(
         'linkWithUnclearPurpose', '#device-missing > A');
   },
 };
 
 TEST_F('MediaRouterElementsBrowserTest', 'MediaRouterElementsTestIssueBanner',
     function() {
   // Register mocha tests for the issue banner.

[apacible, 2016/03/04 17:21:33]

Also remove comments here.

[btolsch, 2016/03/04 20:00:37]

Done.

   issue_banner.registerTests();
 

[apacible, 2016/03/04 17:21:33]

nit: The newline here can also be removed from all test cases.

[btolsch, 2016/03/04 20:00:37]

Done.

   // Run all registered tests.
   mocha.run();
 });
 
-// See bugs.chromium.org issue 591227
+// The media_router_container tests are being split into multiple parts due to
+// timeout issues on bots. The tests are separated such that their runtimes are
+// similar, not necessarily to separate smaller logical units.
 TEST_F('MediaRouterElementsBrowserTest',
-    'DISABLED_MediaRouterElementsTestMediaRouterContainer',
+    'MediaRouterElementsTestMediaRouterContainerPartOne',
     function() {
-  // Register mocha tests for the container.
-  media_router_container.registerTests();
+  media_router_container_part_one.registerTests();
 
-  // Run all registered tests.
+  mocha.run();
+});
+
+TEST_F('MediaRouterElementsBrowserTest',
+    'MediaRouterElementsTestMediaRouterContainerPartTwo',
+    function() {
+  media_router_container_part_two.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();
 });