| 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 10 matching lines...) Expand all Loading... |
| 21 'test_browser_proxy.js', | 21 'test_browser_proxy.js', |
| 22 ]), | 22 ]), |
| 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 because the Settings page can take several |
| 32 // the Settings page can take several seconds to load in a Release build | 32 // seconds to load in a Release build and several times that in a Debug build. |
| 33 // and several times that in a Debug build. See https://crbug.com/558434. | 33 // See https://crbug.com/558434. |
| 34 GEN('#if defined(MEMORY_SANITIZER) || !defined(NDEBUG)'); | 34 GEN('#if !defined(NDEBUG)'); |
| 35 GEN('#define MAYBE_EasyUnlock DISABLED_EasyUnlock'); | 35 GEN('#define MAYBE_EasyUnlock DISABLED_EasyUnlock'); |
| 36 GEN('#else'); | 36 GEN('#else'); |
| 37 GEN('#define MAYBE_EasyUnlock EasyUnlock'); | 37 GEN('#define MAYBE_EasyUnlock EasyUnlock'); |
| 38 GEN('#endif'); | 38 GEN('#endif'); |
| 39 | 39 |
| 40 // Runs change picture tests. | 40 // Runs change picture tests. |
| 41 TEST_F('SettingsEasyUnlockBrowserTest', 'MAYBE_EasyUnlock', function() { | 41 TEST_F('SettingsEasyUnlockBrowserTest', 'MAYBE_EasyUnlock', function() { |
| 42 /** | 42 /** |
| 43 * A test version of EasyUnlockBrowserProxy. Provides helper methods | 43 * A test version of EasyUnlockBrowserProxy. Provides helper methods |
| 44 * for allowing tests to know when a method was called, as well as | 44 * for allowing tests to know when a method was called, as well as |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 }).then(function() { | 234 }).then(function() { |
| 235 Polymer.dom.flush(); | 235 Polymer.dom.flush(); |
| 236 expectFalse(turnOffDialog.$.dialog.open); | 236 expectFalse(turnOffDialog.$.dialog.open); |
| 237 }); | 237 }); |
| 238 }); | 238 }); |
| 239 }); | 239 }); |
| 240 | 240 |
| 241 // Run all registered tests. | 241 // Run all registered tests. |
| 242 mocha.run(); | 242 mocha.run(); |
| 243 }); | 243 }); |
| OLD | NEW |