summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-07 20:55:48 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-07 20:55:48 +0000
commit5a1eca314608d49d6838208b24b76014bab5c9bc (patch)
tree2413a9de2db76e4ef165c40632ad78fd4a05d006 /apps
parent25db38134b250a924fe90cb9271398d25f771cf8 (diff)
downloadchromium_src-5a1eca314608d49d6838208b24b76014bab5c9bc.zip
chromium_src-5a1eca314608d49d6838208b24b76014bab5c9bc.tar.gz
chromium_src-5a1eca314608d49d6838208b24b76014bab5c9bc.tar.bz2
Disable flaky PlatformAppBrowserTest.FileAccessIsRestored on linux.
TBR=koz@chromium.org BUG=269613 Review URL: https://chromiumcodereview.appspot.com/22565004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
-rw-r--r--apps/app_restore_service_browsertest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/app_restore_service_browsertest.cc b/apps/app_restore_service_browsertest.cc
index 44a6df5..c3bac8f 100644
--- a/apps/app_restore_service_browsertest.cc
+++ b/apps/app_restore_service_browsertest.cc
@@ -92,7 +92,14 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAccessIsSavedToPrefs) {
ASSERT_TRUE(file_entries.empty());
}
-IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAccessIsRestored) {
+// Flaky: crbug.com/269613
+#if defined(OS_LINUX)
+#define MAYBE_FileAccessIsRestored DISABLED_FileAccessIsRestored
+#else
+#define MAYBE_FileAccessIsRestored FileAccessIsRestored
+#endif
+
+IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_FileAccessIsRestored) {
content::WindowedNotificationObserver extension_suspended(
chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED,
content::NotificationService::AllSources());