Chromium Code Reviews| Index: chrome/test/data/webui/settings/cr_settings_browsertest.js |
| diff --git a/chrome/test/data/webui/settings/cr_settings_browsertest.js b/chrome/test/data/webui/settings/cr_settings_browsertest.js |
| index fd0c2f6173c3a62912ad3d1df9d0b5c078f64b34..0f54682ee4911d007b9f32fef8ac4b0b3247e255 100644 |
| --- a/chrome/test/data/webui/settings/cr_settings_browsertest.js |
| +++ b/chrome/test/data/webui/settings/cr_settings_browsertest.js |
| @@ -54,21 +54,23 @@ CrSettingsBrowserTest.prototype = { |
| // Have to include command_line.h manually due to GEN calls below. |
| GEN('#include "base/command_line.h"'); |
| -// Times out on memory bots. http://crbug.com/534718 |
| -GEN('#if defined(MEMORY_SANITIZER)'); |
|
dpapad
2016/06/09 01:21:29
Won't removing this line make our tests fail on me
Dan Beam
2016/06/09 01:37:25
the test previously failed for 3 reasons:
a) the
michaelpg
2016/06/09 04:06:36
this is the first bullet point under "advantages"
Dan Beam
2016/06/09 04:37:08
doing more work will always take more time, BUT I
|
| -GEN('#define MAYBE_CrSettingsTest DISABLED_CrSettingsTest'); |
| -GEN('#else'); |
| -GEN('#define MAYBE_CrSettingsTest CrSettingsTest'); |
| -GEN('#endif'); |
| - |
| -// TODO(dbeam): these should be split into multiple TEST_F()s. |
| -TEST_F('CrSettingsBrowserTest', 'MAYBE_CrSettingsTest', function() { |
| +TEST_F('CrSettingsBrowserTest', 'Checkbox', function() { |
| settings_checkbox.registerTests(); |
| + mocha.run(); |
| +}); |
| + |
| +TEST_F('CrSettingsBrowserTest', 'DropdownMenu', function() { |
| settings_dropdown_menu.registerTests(); |
| + mocha.run(); |
| +}); |
| + |
| +TEST_F('CrSettingsBrowserTest', 'PrefUtil', function() { |
| settings_prefUtil.registerTests(); |
| - settings_prefs.registerTests(); |
| + mocha.run(); |
| +}); |
| - // Run all registered tests. |
| +TEST_F('CrSettingsBrowserTest', 'Prefs', function() { |
| + settings_prefs.registerTests(); |
| mocha.run(); |
| }); |