| 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 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 | 23 |
| 24 /** @override */ | 24 /** @override */ |
| 25 preLoad: function() { | 25 preLoad: function() { |
| 26 SettingsPageBrowserTest.prototype.preLoad.call(this); | 26 SettingsPageBrowserTest.prototype.preLoad.call(this); |
| 27 settingsHidePagesByDefaultForTest = true; | 27 settingsHidePagesByDefaultForTest = true; |
| 28 }, | 28 }, |
| 29 }; | 29 }; |
| 30 | 30 |
| 31 // Times out on debug builders and may time out on memory bots because | 31 // Times out on debug builders and may time out on memory bots because |
| 32 // the Settings page can take several seconds to load in a Release build | 32 // the Settings page can take several seconds to load in a Release build |
| 33 // and several times that in a Debug build. See https://crbug.com/558434. | 33 // and several times that in a Debug build. See https://crbug.com/558434 |
| 34 GEN('#if defined(MEMORY_SANITIZER) || !defined(NDEBUG)'); | 34 // and http://crbug.com/711256. |
| 35 GEN('#define MAYBE_EasyUnlock DISABLED_EasyUnlock'); | |
| 36 GEN('#else'); | |
| 37 GEN('#define MAYBE_EasyUnlock EasyUnlock'); | |
| 38 GEN('#endif'); | |
| 39 | 35 |
| 40 // Runs easy unlock tests. | 36 // Runs easy unlock tests. |
| 41 TEST_F('SettingsEasyUnlockBrowserTest', 'MAYBE_EasyUnlock', function() { | 37 TEST_F('SettingsEasyUnlockBrowserTest', 'DISABLED_EasyUnlock', function() { |
| 42 /** | 38 /** |
| 43 * A test version of EasyUnlockBrowserProxy. Provides helper methods | 39 * A test version of EasyUnlockBrowserProxy. Provides helper methods |
| 44 * for allowing tests to know when a method was called, as well as | 40 * for allowing tests to know when a method was called, as well as |
| 45 * specifying mock responses. | 41 * specifying mock responses. |
| 46 * | 42 * |
| 47 * @constructor | 43 * @constructor |
| 48 * @implements {settings.EasyUnlockBrowserProxy} | 44 * @implements {settings.EasyUnlockBrowserProxy} |
| 49 * @extends {settings.TestBrowserProxy} | 45 * @extends {settings.TestBrowserProxy} |
| 50 */ | 46 */ |
| 51 var TestEasyUnlockBrowserProxy = function() { | 47 var TestEasyUnlockBrowserProxy = function() { |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 .then(function() { | 221 .then(function() { |
| 226 Polymer.dom.flush(); | 222 Polymer.dom.flush(); |
| 227 expectFalse(turnOffDialog.$.dialog.open); | 223 expectFalse(turnOffDialog.$.dialog.open); |
| 228 }); | 224 }); |
| 229 }); | 225 }); |
| 230 }); | 226 }); |
| 231 | 227 |
| 232 // Run all registered tests. | 228 // Run all registered tests. |
| 233 mocha.run(); | 229 mocha.run(); |
| 234 }); | 230 }); |
| OLD | NEW |