summaryrefslogtreecommitdiffstats
path: root/sync/android
diff options
context:
space:
mode:
authorjam <jam@chromium.org>2015-09-03 08:19:01 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-03 15:19:43 +0000
commit70ebff2ebc42b13abe2b1bb8fda72a2e4316ccf8 (patch)
treec70e12c00f3184ccdbb1827e673367ebf53ed94c /sync/android
parent9abb76be2b2ef9a7b4eadb0e7213cbc173d1faff (diff)
downloadchromium_src-70ebff2ebc42b13abe2b1bb8fda72a2e4316ccf8.zip
chromium_src-70ebff2ebc42b13abe2b1bb8fda72a2e4316ccf8.tar.gz
chromium_src-70ebff2ebc42b13abe2b1bb8fda72a2e4316ccf8.tar.bz2
Disable flaky org.chromium.sync.AndroidSyncSettingsTest#testAndroidSyncSettingsPostsNotifications
BUG=527856 TBR=apiccion@chromium.org Review URL: https://codereview.chromium.org/1305973010 Cr-Commit-Position: refs/heads/master@{#347158}
Diffstat (limited to 'sync/android')
-rw-r--r--sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java b/sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java
index 507989a..bcd2360 100644
--- a/sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java
+++ b/sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java
@@ -11,6 +11,7 @@ import android.test.InstrumentationTestCase;
import android.test.suitebuilder.annotation.SmallTest;
import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.Feature;
import org.chromium.sync.AndroidSyncSettings.AndroidSyncSettingsObserver;
import org.chromium.sync.signin.AccountManagerHelper;
@@ -310,8 +311,10 @@ public class AndroidSyncSettingsTest extends InstrumentationTestCase {
AndroidSyncSettings.getContractAuthority(mContext));
}
- @SmallTest
- @Feature({"Sync"})
+ /*@SmallTest
+ @Feature({"Sync"})*/
+ // http://crbug.com/527856
+ @DisabledTest
public void testAndroidSyncSettingsPostsNotifications() throws InterruptedException {
// Turn on syncability.
mSyncContentResolverDelegate.setMasterSyncAutomatically(true);