[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}
hylschwy · Dec 11, 2015 · 6eaac12 · 6eaac12
1 parent 757c7e9
commit 6eaac12
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 0 deletions.
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceTest.java
@@ -84,6 +84,7 @@ public void testGetAccountsTwoAccountsRegistered() {
         assertEquals("There should be zero registered account", 0, accounts.length);
     }
 
+    @DisabledTest // http://crbug.com/568620
     @SmallTest
     @Feature({"Sync"})
     public void testGetOAuth2AccessTokenWithTimeoutOnSuccess() {

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninHelperTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninHelperTest.java
@@ -10,6 +10,7 @@
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.AdvancedMockContext;
+import org.chromium.base.test.util.DisabledTest;
 import org.chromium.sync.signin.AccountManagerHelper;
 import org.chromium.sync.signin.ChromeSigninController;
 import org.chromium.sync.test.util.AccountHolder;
@@ -74,6 +75,7 @@ public void testSimpleAccountRename() {
         assertEquals("B", getNewSignedInAccountName());
     }
 
+    @DisabledTest // crbug.com/568623
     @SmallTest
     public void testNotSignedInAccountRename() {
         setSignedInAccountName("A");

diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java
@@ -8,6 +8,7 @@
 import android.util.Pair;
 
 import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.bookmark.BookmarksBridge;
 import org.chromium.chrome.browser.profiles.Profile;
@@ -235,6 +236,7 @@ public void testUploadBookmarkModification() throws Exception {
     }
 
     // Test syncing a bookmark tombstone from client to server.
+    @DisabledTest // crbug.com/568617
     @LargeTest
     @Feature({"Sync"})
     public void testUploadBookmarkTombstone() throws Exception {

diff --git 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.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 void testGetContractAuthority() throws Exception {
                 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
@@ -9,6 +9,7 @@
 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 void testCanonicalAccount() throws InterruptedException {
         assertTrue(hasAccountForName("te.st@gmail.com"));
     }
 
+    @DisabledTest // crbug.com/568636
     @SmallTest
     public void testNonCanonicalAccount() throws InterruptedException {
         addTestAccount("test.me@gmail.com", "password");