summaryrefslogtreecommitdiffstats
path: root/sync/android
diff options
context:
space:
mode:
authorIan Wen <ianwen@chromium.org>2015-11-10 11:54:00 -0800
committerIan Wen <ianwen@chromium.org>2015-11-10 19:55:56 +0000
commit8d832afb5c4484dafd3abd610f26f1ae552dbc98 (patch)
tree036f8b4336ed2940ed8ca40f4883bcb9a090e5d3 /sync/android
parent4c7449cca7681e0428d7206554ebe7eb65cfac3d (diff)
downloadchromium_src-8d832afb5c4484dafd3abd610f26f1ae552dbc98.zip
chromium_src-8d832afb5c4484dafd3abd610f26f1ae552dbc98.tar.gz
chromium_src-8d832afb5c4484dafd3abd610f26f1ae552dbc98.tar.bz2
Disable Flaky AndroidSyncSettingsTest
AndroidSyncSettingsTest#testAccountInitialization() is flaky on Android dbg buildbot. BUG=554154 TBR=nyquist@chromium.org Review URL: https://codereview.chromium.org/1423593008 . Cr-Commit-Position: refs/heads/master@{#358883}
Diffstat (limited to 'sync/android')
-rw-r--r--sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java9
1 files changed, 7 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 7e81802..cabdced 100644
--- a/sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java
+++ b/sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java
@@ -7,6 +7,7 @@ package org.chromium.sync;
import android.accounts.Account;
import android.content.Context;
import android.os.Bundle;
+import android.test.FlakyTest;
import android.test.InstrumentationTestCase;
import android.test.suitebuilder.annotation.SmallTest;
@@ -144,8 +145,12 @@ public class AndroidSyncSettingsTest extends InstrumentationTestCase {
});
}
- @SmallTest
- @Feature({"Sync"})
+ @FlakyTest
+ /*
+ * http://crbug.com/554154
+ * @SmallTest
+ * @Feature({"Sync"})
+ */
public void testAccountInitialization() throws InterruptedException {
// mAccount was set to be syncable and not have periodic syncs.
assertEquals(1, mSyncContentResolverDelegate.mSetIsSyncableCalls);