diff options
| author | dhaddock <dhaddock@chromium.org> | 2015-10-22 19:33:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-23 02:33:57 +0000 |
| commit | f8b29596e5e0dd151a1f1f0810a8203be5f12e2d (patch) | |
| tree | f26b8f213609d9859b46710eba965fa878150d27 /ui | |
| parent | b60cabfb7a8bf376355cf681aebe6d2333fc98e1 (diff) | |
| download | chromium_src-f8b29596e5e0dd151a1f1f0810a8203be5f12e2d.zip chromium_src-f8b29596e5e0dd151a1f1f0810a8203be5f12e2d.tar.gz chromium_src-f8b29596e5e0dd151a1f1f0810a8203be5f12e2d.tar.bz2 | |
Fix for failing gearmenu browser_tests
The lastmodified field strikes again! Waiting for files list is failing
due to a mismatch in last modified field. I've added to ignore it while
wating for files.
BUG=546567
Review URL: https://codereview.chromium.org/1422773002
Cr-Commit-Position: refs/heads/master@{#355712}
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/file_manager/integration_tests/file_manager/gear_menu.js | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/ui/file_manager/integration_tests/file_manager/gear_menu.js b/ui/file_manager/integration_tests/file_manager/gear_menu.js index 834252e..b2c694f 100644 --- a/ui/file_manager/integration_tests/file_manager/gear_menu.js +++ b/ui/file_manager/integration_tests/file_manager/gear_menu.js @@ -102,7 +102,8 @@ function getTestCaseStepsForHiddenFiles(basicSet, hiddenEntrySet) { // Check the hidden files are displayed. function(result) { remoteCall.waitForFiles(appId, TestEntryInfo.getExpectedRows( - hiddenEntrySet)).then(this.next); + hiddenEntrySet), {ignoreFileSize: true, ignoreLastModifiedTime: true}) + .then(this.next); }, // Repeat steps to toggle again. function(inAppId) { @@ -114,8 +115,8 @@ function getTestCaseStepsForHiddenFiles(basicSet, hiddenEntrySet) { }, function(result) { chrome.test.assertTrue(result); - remoteCall.waitForElement(appId, '#gear-menu:not([hidden])') - .then(this.next); + remoteCall.waitForElement(appId, '#gear-menu:not([hidden])').then( + this.next); }, function(result) { remoteCall.waitForElement(appId, @@ -136,8 +137,8 @@ function getTestCaseStepsForHiddenFiles(basicSet, hiddenEntrySet) { '#gear-menu-toggle-hidden-files:not([checked])').then(this.next); }, function(result) { - remoteCall.waitForFiles(appId, TestEntryInfo.getExpectedRows(basicSet)) - .then(this.next); + remoteCall.waitForFiles(appId, TestEntryInfo.getExpectedRows(basicSet), + {ignoreFileSize: true, ignoreLastModifiedTime: true}).then(this.next); }, function() { checkIfNoErrorsOccured(this.next); @@ -244,7 +245,8 @@ testcase.hideGoogleDocs = function() { function(result) { chrome.test.assertTrue(result); remoteCall.waitForFiles(appId, TestEntryInfo.getExpectedRows( - BASIC_DRIVE_ENTRY_SET_WITHOUT_GDOCS)).then(this.next); + BASIC_DRIVE_ENTRY_SET_WITHOUT_GDOCS), {ignoreFileSize: true, + ignoreLastModifiedTime: true}).then(this.next); }, function(inAppId) { remoteCall.waitForElement(appId, '#gear-button').then(this.next); @@ -268,7 +270,8 @@ testcase.hideGoogleDocs = function() { }, function(result) { remoteCall.waitForFiles(appId, TestEntryInfo.getExpectedRows( - BASIC_DRIVE_ENTRY_SET)).then(this.next); + BASIC_DRIVE_ENTRY_SET), {ignoreFileSize: true, + ignoreLastModifiedTime: true}).then(this.next); }, function() { checkIfNoErrorsOccured(this.next); |