| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 /** @fileoverview Suite of tests for Easy Unlock within People section. */ | 5 /** @fileoverview Suite of tests for Easy Unlock within People section. */ |
| 6 | 6 |
| 7 GEN_INCLUDE(['settings_page_browsertest.js']); | 7 GEN_INCLUDE(['settings_page_browsertest.js']); |
| 8 | 8 |
| 9 /** | 9 /** |
| 10 * @constructor | 10 * @constructor |
| 11 * @extends {SettingsPageBrowserTest} | 11 * @extends {SettingsPageBrowserTest} |
| 12 */ | 12 */ |
| 13 function SettingsEasyUnlockBrowserTest() { | 13 function SettingsEasyUnlockBrowserTest() { |
| 14 } | 14 } |
| 15 | 15 |
| 16 SettingsEasyUnlockBrowserTest.prototype = { | 16 SettingsEasyUnlockBrowserTest.prototype = { |
| 17 __proto__: SettingsPageBrowserTest.prototype, | 17 __proto__: SettingsPageBrowserTest.prototype, |
| 18 | 18 |
| 19 /** @override */ | 19 /** @override */ |
| 20 extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([ | 20 extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([ |
| 21 ROOT_PATH + 'ui/webui/resources/js/promise_resolver.js', | |
| 22 'test_browser_proxy.js', | 21 'test_browser_proxy.js', |
| 23 ]), | 22 ]), |
| 24 }; | 23 }; |
| 25 | 24 |
| 26 // Times out on debug builders and may time out on memory bots because | 25 // Times out on debug builders and may time out on memory bots because |
| 27 // the Settings page can take several seconds to load in a Release build | 26 // the Settings page can take several seconds to load in a Release build |
| 28 // and several times that in a Debug build. See https://crbug.com/558434. | 27 // and several times that in a Debug build. See https://crbug.com/558434. |
| 29 GEN('#if defined(MEMORY_SANITIZER) || !defined(NDEBUG)'); | 28 GEN('#if defined(MEMORY_SANITIZER) || !defined(NDEBUG)'); |
| 30 GEN('#define MAYBE_EasyUnlock DISABLED_EasyUnlock'); | 29 GEN('#define MAYBE_EasyUnlock DISABLED_EasyUnlock'); |
| 31 GEN('#else'); | 30 GEN('#else'); |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 }); | 198 }); |
| 200 }); | 199 }); |
| 201 }); | 200 }); |
| 202 }); | 201 }); |
| 203 }); | 202 }); |
| 204 }); | 203 }); |
| 205 | 204 |
| 206 // Run all registered tests. | 205 // Run all registered tests. |
| 207 mocha.run(); | 206 mocha.run(); |
| 208 }); | 207 }); |
| OLD | NEW |