From 275e7a7a9acc2cd8ed471c66775f766d3d956515 Mon Sep 17 00:00:00 2001 From: tbarzic Date: Fri, 24 Apr 2015 08:27:08 -0700 Subject: [PATCH] Fix flakiness in FileManager SuggestAppDialog test Yeah, I forgot to update test in the previous patch :/ https://chromium.googlesource.com/chromium/src/+/0c71fc50716dcf2fef839bde83ef09287c64202b (which changed the element to which show-spinner class was applied) BUG=479757 TEST=Run the test locally Review URL: https://codereview.chromium.org/1105783002 Cr-Commit-Position: refs/heads/master@{#326801} --- .../browser/chromeos/file_manager/file_manager_browsertest.cc | 10 +++++++--- .../integration_tests/file_manager/suggest_app_dialog.js | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc index 825b2c888493..882f037b6be9 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc @@ -1040,10 +1040,14 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( TestParameter(NOT_IN_GUEST_MODE, "traverseDrive"))); // Slow tests are disabled on debug build. http://crbug.com/327719 -// Disabled under MSAN, ASAN, and LSAN as well. http://crbug.com/479757. -// Flakes often: http://crbug.com/479757 +// Disabled under MSAN as well. http://crbug.com/468980. +#if !defined(NDEBUG) || defined(MEMORY_SANITIZER) +#define MAYBE_SuggestAppDialog DISABLED_SuggestAppDialog +#else +#define MAYBE_SuggestAppDialog SuggestAppDialog +#endif WRAPPED_INSTANTIATE_TEST_CASE_P( - DISABLED_SuggestAppDialog, + MAYBE_SuggestAppDialog, FileManagerBrowserTest, ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "suggestAppDialog"))); diff --git a/ui/file_manager/integration_tests/file_manager/suggest_app_dialog.js b/ui/file_manager/integration_tests/file_manager/suggest_app_dialog.js index 0c815075cc63..bb5752294daa 100644 --- a/ui/file_manager/integration_tests/file_manager/suggest_app_dialog.js +++ b/ui/file_manager/integration_tests/file_manager/suggest_app_dialog.js @@ -53,7 +53,7 @@ testcase.suggestAppDialog = function() { function(result) { chrome.test.assertTrue(!!result); remoteCall.waitForElement( - appId, '.cws-widget-webview-container:not(.cws-widget-show-spinner)'). + appId, '.cws-widget-spinner-layer:not(.cws-widget-show-spinner)'). then(this.next); }, // Override task APIs for test. -- 2.11.4.GIT