summaryrefslogtreecommitdiffstats
path: root/sync/android
diff options
context:
space:
mode:
authorjbudorick <jbudorick@chromium.org>2015-12-10 17:55:41 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-11 01:56:29 +0000
commit6eaac12aeae498945407e9d5818ba578d06204c7 (patch)
tree724533c7f9f5fdc3cf425d4a7e15afd999c43653 /sync/android
parent757c7e9b4660fcea4f7d4190e9ec5437634bf320 (diff)
downloadchromium_src-6eaac12aeae498945407e9d5818ba578d06204c7.zip
chromium_src-6eaac12aeae498945407e9d5818ba578d06204c7.tar.gz
chromium_src-6eaac12aeae498945407e9d5818ba578d06204c7.tar.bz2
[Android] Disable five flaky sync & signin tests.
BUG=568617,568620,568623,568633,568636 TBR=yfriedman@chromium.org Review URL: https://codereview.chromium.org/1516123002 Cr-Commit-Position: refs/heads/master@{#364581}
Diffstat (limited to 'sync/android')
-rw-r--r--sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java2
-rw-r--r--sync/android/javatests/src/org/chromium/sync/notifier/signin/AccountManagerHelperTest.java2
2 files changed, 4 insertions, 0 deletions
diff --git a/sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java b/sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java
index fc2c382..77eaf17 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;
@@ -311,6 +312,7 @@ public class AndroidSyncSettingsTest extends InstrumentationTestCase {
AndroidSyncSettings.getContractAuthority(mContext));
}
+ @DisabledTest // crbug.com/568633
@SmallTest
@Feature({"Sync"})
public void testAndroidSyncSettingsPostsNotifications() throws InterruptedException {
diff --git a/sync/android/javatests/src/org/chromium/sync/notifier/signin/AccountManagerHelperTest.java b/sync/android/javatests/src/org/chromium/sync/notifier/signin/AccountManagerHelperTest.java
index 23220ec..f0dd35c 100644
--- a/sync/android/javatests/src/org/chromium/sync/notifier/signin/AccountManagerHelperTest.java
+++ b/sync/android/javatests/src/org/chromium/sync/notifier/signin/AccountManagerHelperTest.java
@@ -9,6 +9,7 @@ import android.content.Context;
import android.test.InstrumentationTestCase;
import android.test.suitebuilder.annotation.SmallTest;
+import org.chromium.base.test.util.DisabledTest;
import org.chromium.sync.signin.AccountManagerHelper;
import org.chromium.sync.test.util.AccountHolder;
import org.chromium.sync.test.util.MockAccountManager;
@@ -41,6 +42,7 @@ public class AccountManagerHelperTest extends InstrumentationTestCase {
assertTrue(hasAccountForName("te.st@gmail.com"));
}
+ @DisabledTest // crbug.com/568636
@SmallTest
public void testNonCanonicalAccount() throws InterruptedException {
addTestAccount("test.me@gmail.com", "password");