summaryrefslogtreecommitdiffstats
path: root/chrome/android
diff options
context:
space:
mode:
authortim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-05 22:49:52 +0000
committertim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-05 22:49:52 +0000
commit384b92661c8bfa0c80b92cfa4d1118cd9de0dc6d (patch)
tree84e8c0a1809fc15d570121fa8b7ca4ddcec47c27 /chrome/android
parentdfbd4243dfce8467bcf76ae422267f0cca8f6600 (diff)
downloadchromium_src-384b92661c8bfa0c80b92cfa4d1118cd9de0dc6d.zip
chromium_src-384b92661c8bfa0c80b92cfa4d1118cd9de0dc6d.tar.gz
chromium_src-384b92661c8bfa0c80b92cfa4d1118cd9de0dc6d.tar.bz2
Revert 254791 "Disable HostDriven_SyncTest.testDisableAndEnableSync"
> Disable HostDriven_SyncTest.testDisableAndEnableSync > > BUG=348951 > NOTRY=true > > Review URL: https://codereview.chromium.org/180273024 NOTRY=true R=boliu@chromium.org, nyquist@chromium.org TBR=nyquist@chromium.org Review URL: https://codereview.chromium.org/186643004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255168 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/android')
-rwxr-xr-xchrome/android/host_driven_tests/SyncTest.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/android/host_driven_tests/SyncTest.py b/chrome/android/host_driven_tests/SyncTest.py
index 27d6db9..020c9046 100755
--- a/chrome/android/host_driven_tests/SyncTest.py
+++ b/chrome/android/host_driven_tests/SyncTest.py
@@ -56,10 +56,8 @@ class SyncTest(test_case.HostDrivenTestCase):
java_tests = ['testAboutSyncPageDisplaysCurrentSyncStatus']
return self._RunSyncTests(java_tests)
- # @tests_annotations.Feature(['Sync'])
- # @tests_annotations.EnormousTest
- # See crbug.com/348951
- @tests_annotations.DisabledTest
+ @tests_annotations.Feature(['Sync'])
+ @tests_annotations.EnormousTest
def testDisableAndEnableSync(self):
java_tests = ['testDisableAndEnableSync']
return self._RunSyncTests(java_tests)