summaryrefslogtreecommitdiffstats
path: root/sync
diff options
context:
space:
mode:
authormaxbogue <maxbogue@chromium.org>2016-01-14 11:12:39 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-14 19:14:54 +0000
commit152c9fc338d025dd696d2246d312f1cc0c14cadb (patch)
treef8bd20362104d52fc3dc7dbf1cbe177b7f5e3662 /sync
parent7a6ed5b30840876c7d0e37b942e5bd2fd44ca93c (diff)
downloadchromium_src-152c9fc338d025dd696d2246d312f1cc0c14cadb.zip
chromium_src-152c9fc338d025dd696d2246d312f1cc0c14cadb.tar.gz
chromium_src-152c9fc338d025dd696d2246d312f1cc0c14cadb.tar.bz2
[Sync] Enable testAndroidSyncSettingsPostsNotifications.
It was disabled for being flaky but I just ran it over 200 times in a row with no failures, and I have no further information on how it was flaking. BUG=569209 Review URL: https://codereview.chromium.org/1576113002 Cr-Commit-Position: refs/heads/master@{#369493}
Diffstat (limited to 'sync')
-rw-r--r--sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java2
1 files changed, 0 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 77eaf17..fc2c382 100644
--- a/sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java
+++ b/sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java
@@ -11,7 +11,6 @@ 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;
@@ -312,7 +311,6 @@ public class AndroidSyncSettingsTest extends InstrumentationTestCase {
AndroidSyncSettings.getContractAuthority(mContext));
}
- @DisabledTest // crbug.com/568633
@SmallTest
@Feature({"Sync"})
public void testAndroidSyncSettingsPostsNotifications() throws InterruptedException {