diff options
| -rw-r--r-- | chrome/browser/chromeos/file_manager/file_manager_browsertest.cc | 11 | ||||
| -rw-r--r-- | ui/file_manager/integration_tests/file_manager/tab_index.js | 19 |
2 files changed, 22 insertions, 8 deletions
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc index 42e49c1..d53959d 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc @@ -1153,9 +1153,16 @@ INSTANTIATE_TEST_CASE_P( "tabindexFocusDownloads"), TestParameter(IN_GUEST_MODE, "tabindexFocusDownloads"))); -// http://crbug.com/469061 +// Slow tests are disabled on debug build. http://crbug.com/327719 +// Disabled under MSAN as well. http://crbug.com/468980. +#if !defined(NDEBUG) || defined(MEMORY_SANITIZER) +#define MAYBE_TabindexFocusDirectorySelected \ + DISABLED_TabindexFocusDirectorySelected +#else +#define MAYBE_TabindexFocusDirectorySelected TabindexFocusDirectorySelected +#endif INSTANTIATE_TEST_CASE_P( - DISABLED_TabindexFocusDirectorySelected, + MAYBE_TabindexFocusDirectorySelected, FileManagerBrowserTest, ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "tabindexFocusDirectorySelected"))); diff --git a/ui/file_manager/integration_tests/file_manager/tab_index.js b/ui/file_manager/integration_tests/file_manager/tab_index.js index a6e8906..a183688 100644 --- a/ui/file_manager/integration_tests/file_manager/tab_index.js +++ b/ui/file_manager/integration_tests/file_manager/tab_index.js @@ -151,21 +151,28 @@ testcase.tabindexFocusDirectorySelected = function() { // Check that the file list has the focus on launch. function(inAppId) { appId = inAppId; - remoteCall.waitForElement(appId, ['#file-list:focus']).then(this.next); - }, - function(element) { - remoteCall.waitForElement(appId, ['#drive-welcome-link']).then(this.next); + Promise.all([ + remoteCall.waitForElement(appId, ['#file-list:focus']), + remoteCall.waitForElement(appId, ['#drive-welcome-link']), + ]).then(this.next); }, - function(element) { + function(elements) { remoteCall.callRemoteTestUtil('getActiveElement', appId, [], this.next); }, function(element) { chrome.test.assertEq('list', element.attributes['class']); // Select the directory named 'photos'. remoteCall.callRemoteTestUtil( 'selectFile', appId, ['photos']).then(this.next); - // Press the Tab key. }, function(result) { chrome.test.assertTrue(result); + Promise.all([ + remoteCall.waitForElement( + appId, ['#share-button:not([hidden]):not([disabled])']), + remoteCall.waitForElement( + appId, ['#delete-button:not([hidden]):not([disabled])']), + ]).then(this.next); + // Press the Tab key. + }, function(elements) { remoteCall.checkNextTabFocus(appId, 'share-button').then(this.next); }, function(result) { chrome.test.assertTrue(result); |